9c32bd25575de032ce4a4fae5bf596e2 avifile-0.50.tar.gz

Changed files:
    avifile-0.50.bitrate.patch -> 1.1
    avifile-DESTDIR.patch -> 1.4
    avifile-old_ver_conflict.patch -> 1.5

diff --git a/avifile-0.50.bitrate.patch b/avifile-0.50.bitrate.patch
new file mode 100644 (file)
index 0000000..0220929
--- /dev/null
+++ b/avifile-0.50.bitrate.patch
@@ -0,0 +1,27 @@
+diff -ru avifile-0.50.orig/lib/videocodec/Module.cpp avifile-0.50/lib/videocodec/Module.cpp
+--- avifile-0.50.orig/lib/videocodec/Module.cpp        Sat Sep 30 11:17:51 2000
++++ avifile-0.50/lib/videocodec/Module.cpp     Tue Oct 24 23:17:22 2000
+@@ -44,12 +44,12 @@
+       throw FATAL("Could not load library");
+     try
+     { 
+-      if(name==string("divxc32.dll"))
++      if(name==string("divxc32.dll") || name==string("divxc32f.dll"))
+       {
+           int newkey;
+           int bitrate;        
+           int count=4;
+-          if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\LinuxLoader\\div3", 0, 0, &newkey)!=0)
++          if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\LinuxLoader\\Div3", 0, 0, &newkey)!=0)
+           {
+ //            cerr<<"Could not open Divx key"<<endl;
+               goto no_reg;
+@@ -60,7 +60,7 @@
+               RegCloseKey(newkey);
+               goto no_reg;
+           }    
+- 
++          printf("::module bitrate: %d\n",bitrate);
+           *(double*)((char*)_handle+0x14c0)=bitrate;
+           RegCloseKey(newkey);
+       no_reg:

diff --git a/avifile-DESTDIR.patch b/avifile-DESTDIR.patch
index 5f0e0085aa6d473d00f2fae2e7f90525d46a9289..9f81b45878c43d9aa2c4abc953bda0d3412aaa49 100644 (file)
--- a/avifile-DESTDIR.patch
+++ b/avifile-DESTDIR.patch
@@ -1,42 +1,79 @@
-diff -ur avifile-0.47.1.orig/Makefile.in avifile-0.47.1/Makefile.in
---- avifile-0.47.1.orig/Makefile.in    Sun Sep 10 14:55:06 2000
-+++ avifile-0.47.1/Makefile.in Thu Sep 14 16:43:55 2000
-@@ -41,24 +41,24 @@
+diff -urN avifile-0.50.org/Makefile.in avifile-0.50/Makefile.in
+--- avifile-0.50.org/Makefile.in       Mon Oct 30 00:43:41 2000
++++ avifile-0.50/Makefile.in   Mon Oct 30 00:46:09 2000
+@@ -49,48 +49,48 @@
        -find . -name Makefile -exec rm \{\} \;
  
- install:
--      $(INSTALL_PROGRAM) -d $(datadir)
--      $(INSTALL_PROGRAM) -d $(includedir)/avifile/wine
+ stable-install:
 -      $(INSTALL_PROGRAM) -d $(datadir)/avifile
+-      $(INSTALL_PROGRAM) -d $(libdir)
+-      $(INSTALL_PROGRAM) -d $(bindir)
 -      $(INSTALL_PROGRAM) ./lib/libaviplay.so $(libdir)
--      $(INSTALL_PROGRAM) ./include/*.h $(includedir)/avifile
--      $(INSTALL_PROGRAM) ./include/wine/*.h $(includedir)/avifile/wine
--      $(INSTALL_PROGRAM) ./bin/aviplay $(bindir)
--      $(INSTALL_PROGRAM) ./bin/benchmark $(bindir)
-+      $(INSTALL_PROGRAM) -d $(DESTDIR)$(datadir)
-+      $(INSTALL_PROGRAM) -d $(DESTDIR)$(includedir)/avifile/wine
 +      $(INSTALL_PROGRAM) -d $(DESTDIR)$(datadir)/avifile
++      $(INSTALL_PROGRAM) -d $(DESTDIR)$(libdir)
++      $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
 +      $(INSTALL_PROGRAM) ./lib/libaviplay.so $(DESTDIR)$(libdir)
-+      $(INSTALL_PROGRAM) ./include/*.h $(DESTDIR)$(includedir)/avifile
-+      $(INSTALL_PROGRAM) ./include/wine/*.h $(DESTDIR)$(includedir)/avifile/wine
+ ifeq (@USE_QT@,1)
+-      $(INSTALL_PROGRAM) ./bin/aviplay $(bindir)
+-      $(INSTALL_PROGRAM) ./bin/benchmark $(bindir)
+-      $(INSTALL_PROGRAM) ./bin/*.ppm $(datadir)/avifile
+-      $(INSTALL_PROGRAM) ./bin/*.png $(datadir)/avifile
 +      $(INSTALL_PROGRAM) ./bin/aviplay $(DESTDIR)$(bindir)
 +      $(INSTALL_PROGRAM) ./bin/benchmark $(DESTDIR)$(bindir)
++      $(INSTALL_PROGRAM) ./bin/*.ppm $(DESTDIR)$(datadir)/avifile
++      $(INSTALL_PROGRAM) ./bin/*.png $(DESTDIR)$(datadir)/avifile
  ifeq (@USE_VIDCAP@,1)
 -      $(INSTALL_PROGRAM) ./bin/qtvidcap $(bindir)
 -      $(INSTALL_PROGRAM) -m4755 ./bin/kv4lsetup $(bindir)
 +      $(INSTALL_PROGRAM) ./bin/qtvidcap $(DESTDIR)$(bindir)
 +      $(INSTALL_PROGRAM) -m4755 ./bin/kv4lsetup $(DESTDIR)$(bindir)
  endif 
--      $(INSTALL_PROGRAM) ./bin/*.ppm $(datadir)/avifile
--      $(INSTALL_PROGRAM) ./bin/*.png $(datadir)/avifile
-+      $(INSTALL_PROGRAM) ./bin/*.ppm $(DESTDIR)$(datadir)/avifile
-+      $(INSTALL_PROGRAM) ./bin/*.png $(DESTDIR)$(datadir)/avifile
+ endif
+-      $(INSTALL_PROGRAM) -m0755 ./avifile-config $(bindir)
++      $(INSTALL_PROGRAM) -m0755 ./avifile-config $(DESTDIR)$(bindir)
+ 
+ install:
+-      -$(INSTALL_PROGRAM) -d $(datadir)
+-      -$(INSTALL_PROGRAM) -d $(includedir)/avifile/wine
+-      -$(INSTALL_PROGRAM) -d $(datadir)/avifile
+-      -$(INSTALL_PROGRAM) -d $(libdir)
+-      -$(INSTALL_PROGRAM) -d $(bindir)
+-      -$(INSTALL_PROGRAM) ./lib/libaviplay.so $(libdir)
+-      -$(INSTALL_PROGRAM) ./include/*.h $(includedir)/avifile
+-      -$(INSTALL_PROGRAM) ./include/wine/*.h $(includedir)/avifile/wine
++      -$(INSTALL_PROGRAM) -d $(DESTDIR)$(datadir)
++      -$(INSTALL_PROGRAM) -d $(DESTDIR)$(includedir)/avifile/wine
++      -$(INSTALL_PROGRAM) -d $(DESTDIR)$(datadir)/avifile
++      -$(INSTALL_PROGRAM) -d $(DESTDIR)$(libdir)
++      -$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
++      -$(INSTALL_PROGRAM) ./lib/libaviplay.so $(DESTDIR)$(libdir)
++      -$(INSTALL_PROGRAM) ./include/*.h $(DESTDIR)$(includedir)/avifile
++      -$(INSTALL_PROGRAM) ./include/wine/*.h $(DESTDIR)$(includedir)/avifile/wine
+ ifeq (@USE_QT@,1)     
+-      -$(INSTALL_PROGRAM) ./bin/aviplay $(bindir)
+-      -$(INSTALL_PROGRAM) ./bin/benchmark $(bindir)
+-      -$(INSTALL_PROGRAM) ./bin/*.ppm $(datadir)/avifile
+-      -$(INSTALL_PROGRAM) ./bin/*.png $(datadir)/avifile
++      -$(INSTALL_PROGRAM) ./bin/aviplay $(DESTDIR)$(bindir)
++      -$(INSTALL_PROGRAM) ./bin/benchmark $(DESTDIR)$(bindir)
++      -$(INSTALL_PROGRAM) ./bin/*.ppm $(DESTDIR)$(datadir)/avifile
++      -$(INSTALL_PROGRAM) ./bin/*.png $(DESTDIR)$(datadir)/avifile
+ ifeq (@USE_VIDCAP@,1)
+-      -$(INSTALL_PROGRAM) ./bin/qtvidcap $(bindir)
+-      -$(INSTALL_PROGRAM) -m4755 ./bin/kv4lsetup $(bindir)
++      -$(INSTALL_PROGRAM) ./bin/qtvidcap $(DESTDIR)$(bindir)
++      -$(INSTALL_PROGRAM) -m4755 ./bin/kv4lsetup $(DESTDIR)$(bindir)
+ endif 
+ ifeq (@USE_QTRECOMP@,1)
+-      -$(INSTALL_PROGRAM) ./bin/qtrecompress $(bindir)
++      -$(INSTALL_PROGRAM) ./bin/qtrecompress $(DESTDIR)$(bindir)
+ endif
+ endif
  ifeq (@USE_JPEGLIB@,1)
--      $(INSTALL_PROGRAM) ./lib/libavi_mjpeg.so @WIN32_PATH@
-+      -mkdir $(DESTDIR)@WIN32_PATH@
-+      $(INSTALL_PROGRAM) ./lib/libavi_mjpeg.so $(DESTDIR)@WIN32_PATH@
+       -$(INSTALL_PROGRAM) ./lib/libavi_mjpeg.so @WIN32_PATH@
  endif
--      /sbin/ldconfig
+-      -$(INSTALL_PROGRAM) -m0755 ./avifile-config $(bindir)
++      -$(INSTALL_PROGRAM) -m0755 ./avifile-config $(DESTDIR)$(bindir)
+       /sbin/ldconfig @LDCONFIGOPTS@
  
  devinst:
-       $(INSTALL_PROGRAM) -d $(datadir)/avifile

diff --git a/avifile-old_ver_conflict.patch b/avifile-old_ver_conflict.patch
index b4601779ad9f017cd1f25516a712809f23e9cc29..4b567c6d32b87616102269152d825b0357ff3b58 100644 (file)
--- a/avifile-old_ver_conflict.patch
+++ b/avifile-old_ver_conflict.patch
@@ -1,64 +1,22 @@
-diff -urN avifile-0.48.orig/samples/benchmark/Makefile.in avifile-0.48/samples/benchmark/Makefile.in
---- avifile-0.48.orig/samples/benchmark/Makefile.in    Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/benchmark/Makefile.in Wed Sep 27 16:46:23 2000
+diff -urN avifile-0.50.org/samples/benchmark/Makefile.in avifile-0.50/samples/benchmark/Makefile.in
+--- avifile-0.50.org/samples/benchmark/Makefile.in     Mon Oct 30 00:43:43 2000
++++ avifile-0.50/samples/benchmark/Makefile.in Mon Oct 30 00:48:17 2000
 @@ -6,7 +6,7 @@
      
  
- LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
+ LIBS=@LIBS@ -lX11 -lXext @QT_NAME@ -laviplay @DGA_LDADD@ @SDL_LIBS@
 -LIB_DIRS=@QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
-+LIB_DIRS=-L../../lib @QT_LDFLAGS@ -L/usr/X11R6/lib 
++LIB_DIRS=-L../../lib @QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
  
  MOC=@MOC@
  CDOPT=@CD_OPT@
-diff -urN avifile-0.48.orig/samples/extractor/Makefile.in avifile-0.48/samples/extractor/Makefile.in
---- avifile-0.48.orig/samples/extractor/Makefile.in    Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/extractor/Makefile.in Wed Sep 27 16:46:23 2000
+diff -urN avifile-0.50.org/samples/extractor/Makefile.in avifile-0.50/samples/extractor/Makefile.in
+--- avifile-0.50.org/samples/extractor/Makefile.in     Mon Oct 30 00:43:43 2000
++++ avifile-0.50/samples/extractor/Makefile.in Mon Oct 30 00:48:29 2000
 @@ -1,5 +1,5 @@
  CPPFLAGS=-g -I../../include
 -LIBS=@X_LDFLAGS@ @LIBS@ -laviplay -L../../lib
-+LIBS=-L../../lib @X_LDFLAGS@ @LIBS@ -laviplay 
++LIBS= -L../../lib @X_LDFLAGS@ @LIBS@ -laviplay -L../../lib
  
  OBJS=extractor.o
  
-diff -urN avifile-0.48.orig/samples/plustest/Makefile.in avifile-0.48/samples/plustest/Makefile.in
---- avifile-0.48.orig/samples/plustest/Makefile.in     Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/plustest/Makefile.in  Wed Sep 27 16:46:23 2000
-@@ -1,6 +1,6 @@
- CPPFLAGS=-g -I../../include
- OPTFLAGS=-I..
--LIBS=@X_LDFLAGS@ @LIBS@ -laviplay -L../../lib
-+LIBS=-L../../lib @X_LDFLAGS@ @LIBS@ -laviplay 
- 
- OBJS=main.o
- 
-diff -urN avifile-0.48.orig/samples/qtvidcap/Makefile.in avifile-0.48/samples/qtvidcap/Makefile.in
---- avifile-0.48.orig/samples/qtvidcap/Makefile.in     Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/qtvidcap/Makefile.in  Wed Sep 27 16:47:24 2000
-@@ -9,7 +9,7 @@
- 
- MOC=@MOC@
- LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay $(DGA_LDADD) @SDL_LIBS@
--LIB_DIRS=$(QT_LDADD) -L/usr/X11R6/lib -L../../lib
-+LIB_DIRS=-L../../lib $(QT_LDADD) -L/usr/X11R6/lib
- CDOPT=@CD_OPT@
- LDOPT=@LD_OPT@
- QT_LDADD=@QT_LDFLAGS@
-diff -urN avifile-0.48.orig/samples/recompressor/Makefile.in avifile-0.48/samples/recompressor/Makefile.in
---- avifile-0.48.orig/samples/recompressor/Makefile.in Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/recompressor/Makefile.in      Wed Sep 27 16:46:23 2000
-@@ -1,5 +1,5 @@
- CPPFLAGS=-g -I../../include
--LIBS=@X_LDFLAGS@ @LIBS@ -laviplay -L../../lib
-+LIBS=-L../../lib @X_LDFLAGS@ @LIBS@ -laviplay 
- 
- OBJS=recompr.o
- 
-diff -urN avifile-0.48.orig/samples/regeditor/Makefile.in avifile-0.48/samples/regeditor/Makefile.in
---- avifile-0.48.orig/samples/regeditor/Makefile.in    Wed Sep 27 16:46:06 2000
-+++ avifile-0.48/samples/regeditor/Makefile.in Wed Sep 27 16:46:23 2000
-@@ -13,4 +13,4 @@
-       $(CC) $(CFLAGS) $(DEFINES) -c $<
- 
- regeditor:  $(LIB_OBJECTS)
--      $(CC)  $(LIB_OBJECTS)  -lloader -L../../lib -o ../../bin/regeditor
-+      $(CC)  $(LIB_OBJECTS)  -L../../lib -lloader -o ../../bin/regeditor