- merged

Changed files:
    avifile-deplib.patch -> 1.4
    avifile-lt14.patch -> 1.2

diff --git a/avifile-deplib.patch b/avifile-deplib.patch
index c93faf0dfcbc0457986bbfed5104daccebb36420..47d28046fbdde0ec1d1968bde6ec40069555dec4 100644 (file)
--- a/avifile-deplib.patch
+++ b/avifile-deplib.patch
@@ -15,7 +15,7 @@ diff -urN avifile-0.6.org/plugins/libaudiodec/Makefile.am avifile-0.6/plugins/li
  CXXFLAGS = @CXXFLAGS@ @AC3_CFLAGS@
  
 -LIBS=
-+LIBS=-L../../lib/.libs -laviplay -lstdc++
++LIBS=-L../../lib -laviplay -lstdc++
 diff -urN avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am
 --- avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am    Mon Apr  2 15:55:27 2001
 +++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Mon Apr  2 15:55:35 2001
@@ -24,7 +24,7 @@ diff -urN avifile-0.6.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6/pl
  libmp3lame_audioenc_la_LDFLAGS = -module
  
 -LIBS=
-+LIBS=-L../../lib/.libs -laviplay -lstdc++
++LIBS=-L../../lib -laviplay -lstdc++
 diff -urN avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am avifile-0.6/plugins/libmpeg_audiodec/Makefile.am
 --- avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am       Mon Apr  2 15:55:27 2001
 +++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Mon Apr  2 15:56:01 2001
@@ -33,7 +33,7 @@ diff -urN avifile-0.6.org/plugins/libmpeg_audiodec/Makefile.am avifile-0.6/plugi
  CXXFLAGS = @CXXFLAGS@ -O2
  
 -LIBS =
-+LIBS = -L../../lib/.libs -laviplay -lstdc++
++LIBS = -L../../lib -laviplay -lstdc++
 +
 diff -urN avifile-0.6.org/plugins/libwin32/Makefile.am avifile-0.6/plugins/libwin32/Makefile.am
 --- avifile-0.6.org/plugins/libwin32/Makefile.am       Mon Apr  2 15:55:28 2001
@@ -43,4 +43,4 @@ diff -urN avifile-0.6.org/plugins/libwin32/Makefile.am avifile-0.6/plugins/libwi
  CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
  
 -LIBS = @AVILIBDEPLIB@
-+LIBS = @AVILIBDEPLIB@  -L../../lib/.libs -laviplay -lstdc++
++LIBS = @AVILIBDEPLIB@  -L../../lib -laviplay -lstdc++

diff --git a/avifile-lt14.patch b/avifile-lt14.patch
deleted file mode 100644 (file)
index 2b5b33a..0000000
--- a/avifile-lt14.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur avifile-0.6.orig/plugins/libaudiodec/Makefile.am avifile-0.6/plugins/libaudiodec/Makefile.am
---- avifile-0.6.orig/plugins/libaudiodec/Makefile.am   Thu May 24 00:06:52 2001
-+++ avifile-0.6/plugins/libaudiodec/Makefile.am        Thu May 24 00:08:27 2001
-@@ -7,4 +7,4 @@
- libaudiodec_la_LDFLAGS = @AC3_LIBS@ @AC3_LDADD@ -module
- CXXFLAGS = @CXXFLAGS@ @AC3_CFLAGS@
- 
--LIBS=-L../../lib/.libs -laviplay -lstdc++
-+LIBS=-L../../lib -laviplay -lstdc++
-diff -Nur avifile-0.6.orig/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am
---- avifile-0.6.orig/plugins/libmp3lame_audioenc/Makefile.am   Thu May 24 00:06:52 2001
-+++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Thu May 24 00:08:40 2001
-@@ -4,4 +4,4 @@
- libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp mp3encoder.h fillplugins.h
- libmp3lame_audioenc_la_LDFLAGS = -module
- 
--LIBS=-L../../lib/.libs -laviplay -lstdc++
-+LIBS=-L../../lib -laviplay -lstdc++
-diff -Nur avifile-0.6.orig/plugins/libmpeg_audiodec/Makefile.am avifile-0.6/plugins/libmpeg_audiodec/Makefile.am
---- avifile-0.6.orig/plugins/libmpeg_audiodec/Makefile.am      Thu May 24 00:06:52 2001
-+++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Thu May 24 00:08:49 2001
-@@ -11,5 +11,5 @@
- # -finline-functions 
- CXXFLAGS = $(OPTFLG) @CXXFLAGS@ 
- 
--LIBS = -L../../lib/.libs -laviplay -lstdc++
-+LIBS = -L../../lib -laviplay -lstdc++
- 
-diff -Nur avifile-0.6.orig/plugins/libwin32/Makefile.am avifile-0.6/plugins/libwin32/Makefile.am
---- avifile-0.6.orig/plugins/libwin32/Makefile.am      Thu May 24 00:06:52 2001
-+++ avifile-0.6/plugins/libwin32/Makefile.am   Thu May 24 00:08:58 2001
-@@ -14,4 +14,4 @@
- 
- CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
- 
--LIBS = @AVILIBDEPLIB@  -L../../lib/.libs -laviplay -lstdc++
-+LIBS = @AVILIBDEPLIB@  -L../../lib -laviplay -lstdc++