From: depesz <depesz@depesz.pl>
Date: Wed, 14 Aug 2002 11:28:52 +0000 (+0000)
Subject: - new verion: 7f48084c316bb2626a43c1fb98600334  nvrec-20020710.tar.gz
X-Git-Url: https://git.pld-linux.org/?p=packages%2FNVrec.git;a=commitdiff_plain;h=435ffd647a1e31efa76a38db8e2954d68414c464

- new verion: 7f48084c316bb2626a43c1fb98600334  nvrec-20020710.tar.gz

Changed files:
    NVrec-avifile-0.6.patch -> 1.2
    NVrec-make.patch -> 1.2
---

diff --git a/NVrec-avifile-0.6.patch b/NVrec-avifile-0.6.patch
deleted file mode 100644
index 0c651ed..0000000
--- a/NVrec-avifile-0.6.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Nur NVrec.orig/divx4/divx4file_core.c NVrec-20010808/divx4/divx4file_core.c
---- NVrec.orig/divx4/divx4file_core.c	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/divx4/divx4file_core.c	Fri Aug 31 12:51:32 2001
-@@ -24,7 +24,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include "avilib.h"
--#include "encore2.h"
-+#include "divx/encore2.h"
- #include "lame3.70/lame.h"
- #include "../NVrec.h"
- 
-diff -Nur NVrec.orig/divxfile_core.cpp NVrec-20010808/divxfile_core.cpp
---- NVrec.orig/divxfile_core.cpp	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/divxfile_core.cpp	Fri Aug 31 12:47:45 2001
-@@ -25,9 +25,14 @@
- #include <videoencoder.h>
- #include <avifile.h>
- #include <aviplay.h>
-+#include <fourcc.h>
-+#include <creators.h>
-+#include <stdio.h>
- #include <version.h>
- #include "NVrec.h"
- 
-+using namespace Creators;
-+
- struct divxfile_core_t {
- 	IAviWriteFile * avifile;
- 	unsigned char * framebuffer;
-@@ -160,7 +165,7 @@
- 	
- 	unlink(fname);
- 	divxc->avifile = CreateIAviWriteFile(fname);
--	IVideoEncoder::SetExtendedAttr(codec, "BitRate", divxbitrate);
-+	SetCodecAttr(*CodecInfo::match(codec, CodecInfo::Video,0),"BitRate", divxbitrate);	
- 	fccHandler = codec;
- 	framerate = 1e9 / (double)vrate;
- 	
-diff -Nur NVrec.orig/tools/qt2divx.cpp NVrec-20010808/tools/qt2divx.cpp
---- NVrec.orig/tools/qt2divx.cpp	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/tools/qt2divx.cpp	Fri Aug 31 12:50:17 2001
-@@ -29,12 +29,15 @@
- 
- #include <videoencoder.h>
- #include <avifile.h>
-+#include <fourcc.h>
-+#include <creators.h>
- #include <aviplay.h>
--#include <aviutil.h>
- #include <version.h>
- #include <quicktime/quicktime.h>
- #include <sys/time.h>
- 
-+using namespace Creators;
-+
- quicktime_t *qtedopen(char *fname, long * count, unsigned long long * apos)
- {
- 	quicktime_t *f = NULL;
-@@ -310,7 +313,7 @@
- 
- 	avifile=CreateIAviWriteFile(outputfile);
- 	
--	IVideoEncoder::SetExtendedAttr(codec, "BitRate", divxbitrate);
-+	SetCodecAttr(*CodecInfo::match(codec, CodecInfo::Video,0),"BitRate", divxbitrate);	
- 
- 	BITMAPINFOHEADER bh;
- 	memset(&bh,0,sizeof(BITMAPINFOHEADER));
diff --git a/NVrec-make.patch b/NVrec-make.patch
deleted file mode 100644
index 64f48c0..0000000
--- a/NVrec-make.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur NVrec.orig/Makefile.am NVrec-20010808/Makefile.am
---- NVrec.orig/Makefile.am	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/Makefile.am	Fri Aug 31 14:22:28 2001
-@@ -50,11 +50,11 @@
- # AVIfile / DivX ;-) record
- DIVXrec_SOURCES	= ${COREFILES} DIVXrec.c divxfile_core.cpp
- CXXFLAGS        = ${CFLAGS} @AVIFILE_CFLAGS@
--DIVXrec_LDADD   = @AVIFILE_LIBS@ 
-+DIVXrec_LDADD   = @AVIFILE_LIBS@ -laviplay
- 
- # DIVX4 record
- DIVX4rec_SOURCES  = ${COREFILES} DIVX4rec.c
--DIVX4rec_LDADD    = divx4/libdivx4file_core.a divx4/lame3.70/libmp3lame.a -lm @DIVX4LINUX_LIBS@
-+DIVX4rec_LDADD    = divx4/libdivx4file_core.a /usr/lib/libmp3lame.a -lm @DIVX4LINUX_LIBS@
- 
- # included the created .spec file in the tarball
- dist-hook: NVrec.spec
-diff -Nur NVrec.orig/configure.in NVrec-20010808/configure.in
---- NVrec.orig/configure.in	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/configure.in	Fri Aug 31 14:21:52 2001
-@@ -163,7 +163,7 @@
- 	    enable_divx4linux=yes)
- if eval "test x$enable_divx4linux = xyes"; then
-   AC_CHECK_LIB(divxencore, encore, HAVE_LIBDIVX4LINUX=yes, HAVE_LIBDIVX4LINUX=no, )
--  AC_CHECK_HEADER(encore2.h, :, HAVE_LIBDIVX4LINUX=no)
-+  AC_CHECK_HEADER(divx/encore2.h, :, HAVE_LIBDIVX4LINUX=no)
-   DIVX4LINUX_LIBS=-ldivxencore
- else
-   HAVE_LIBDIVX4LINUX=no
-diff -Nur NVrec.orig/divx4/Makefile.am NVrec-20010808/divx4/Makefile.am
---- NVrec.orig/divx4/Makefile.am	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/divx4/Makefile.am	Fri Aug 31 14:22:05 2001
-@@ -1,11 +1,6 @@
--SUBDIRS	= lame3.70
--
- noinst_LIBRARIES = libdivx4file_core.a
- noinst_HEADERS	   = avilib.h
- CFLAGS  = ${MIN_CFLAGS}
- 
- libdivx4file_core_a_SOURCES = avilib.c divx4file_core.c
--libdivx4file_core_a_LIBADD  = lame3.70/libmp3lame.a
--
--lame3.70/libmp3lame.a:
--	make -C lame3.70 libmp3lame.a
-+libdivx4file_core_a_LIBADD  = /usr/lib/libmp3lame.a
-diff -Nur NVrec.orig/tools/Makefile.am NVrec-20010808/tools/Makefile.am
---- NVrec.orig/tools/Makefile.am	Wed Aug  8 12:41:25 2001
-+++ NVrec-20010808/tools/Makefile.am	Fri Aug 31 14:21:52 2001
-@@ -17,7 +17,7 @@
- 
- CXXFLAGS  = ${CFLAGS} @AVIFILE_CFLAGS@
- qt2divx_SOURCES = qt2divx.cpp
--qt2divx_LDADD	= @QUICKTIME_LIBS@ @AVIFILE_LIBS@
-+qt2divx_LDADD	= @QUICKTIME_LIBS@ @AVIFILE_LIBS@ -laviplay
- 
- quicktime_codec_RTJ0_so_SOURCES = libquicktime_codec_RTJ0.a
-