- updated to 0.48

[packages/avifile.git] / avifile-old_ver_conflict.patch

diff --git a/avifile-old_ver_conflict.patch b/avifile-old_ver_conflict.patch
index 0c7795932e94a7e0a907e632f3cc927f9574aaa7..b4601779ad9f017cd1f25516a712809f23e9cc29 100644 (file)
--- a/avifile-old_ver_conflict.patch
+++ b/avifile-old_ver_conflict.patch
@@ -1,6 +1,6 @@
-diff -ur avifile-0.47.1.orig/samples/benchmark/Makefile.in avifile-0.47.1/samples/benchmark/Makefile.in
---- avifile-0.47.1.orig/samples/benchmark/Makefile.in  Wed Aug 23 12:49:24 2000
-+++ avifile-0.47.1/samples/benchmark/Makefile.in       Thu Sep 14 16:28:27 2000
+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
 @@ -6,7 +6,7 @@
      
  
@@ -10,10 +10,9 @@ diff -ur avifile-0.47.1.orig/samples/benchmark/Makefile.in avifile-0.47.1/sample
  
  MOC=@MOC@
  CDOPT=@CD_OPT@
-Only in avifile-0.47.1/samples/benchmark: Makefile.in~
-diff -ur avifile-0.47.1.orig/samples/extractor/Makefile.in avifile-0.47.1/samples/extractor/Makefile.in
---- avifile-0.47.1.orig/samples/extractor/Makefile.in  Sun Sep 10 11:10:21 2000
-+++ avifile-0.47.1/samples/extractor/Makefile.in       Thu Sep 14 16:28:42 2000
+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
 @@ -1,5 +1,5 @@
  CPPFLAGS=-g -I../../include
 -LIBS=@X_LDFLAGS@ @LIBS@ -laviplay -L../../lib
@@ -21,10 +20,9 @@ diff -ur avifile-0.47.1.orig/samples/extractor/Makefile.in avifile-0.47.1/sample
  
  OBJS=extractor.o
  
-Only in avifile-0.47.1/samples/extractor: Makefile.in~
-diff -ur avifile-0.47.1.orig/samples/plustest/Makefile.in avifile-0.47.1/samples/plustest/Makefile.in
---- avifile-0.47.1.orig/samples/plustest/Makefile.in   Sat Sep  9 19:53:32 2000
-+++ avifile-0.47.1/samples/plustest/Makefile.in        Thu Sep 14 16:29:03 2000
+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..
@@ -33,23 +31,21 @@ diff -ur avifile-0.47.1.orig/samples/plustest/Makefile.in avifile-0.47.1/samples
  
  OBJS=main.o
  
-Only in avifile-0.47.1/samples/plustest: Makefile.in~
-diff -ur avifile-0.47.1.orig/samples/qtvidcap/Makefile.in avifile-0.47.1/samples/qtvidcap/Makefile.in
---- avifile-0.47.1.orig/samples/qtvidcap/Makefile.in   Tue Sep 12 17:43:45 2000
-+++ avifile-0.47.1/samples/qtvidcap/Makefile.in        Thu Sep 14 16:29:21 2000
+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 -lXxf86dga -lqt -laviplay $(DGA_LDADD) @SDL_LIBS@
+ 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 
++LIB_DIRS=-L../../lib $(QT_LDADD) -L/usr/X11R6/lib
  CDOPT=@CD_OPT@
  LDOPT=@LD_OPT@
  QT_LDADD=@QT_LDFLAGS@
-Only in avifile-0.47.1/samples/qtvidcap: Makefile.in~
-diff -ur avifile-0.47.1.orig/samples/recompressor/Makefile.in avifile-0.47.1/samples/recompressor/Makefile.in
---- avifile-0.47.1.orig/samples/recompressor/Makefile.in       Mon Sep 11 15:44:03 2000
-+++ avifile-0.47.1/samples/recompressor/Makefile.in    Thu Sep 14 16:29:34 2000
+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
@@ -57,14 +53,12 @@ diff -ur avifile-0.47.1.orig/samples/recompressor/Makefile.in avifile-0.47.1/sam
  
  OBJS=recompr.o
  
-Only in avifile-0.47.1/samples/recompressor: Makefile.in~
-diff -ur avifile-0.47.1.orig/samples/regeditor/Makefile.in avifile-0.47.1/samples/regeditor/Makefile.in
---- avifile-0.47.1.orig/samples/regeditor/Makefile.in  Sat Aug 19 09:46:14 2000
-+++ avifile-0.47.1/samples/regeditor/Makefile.in       Thu Sep 14 16:30:03 2000
+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
-Only in avifile-0.47.1/samples/regeditor: Makefile.in~