- Updated for 20011220 snapshot.

Changed files:
    avifile-amfix.patch -> 1.2
    avifile-deplib.patch -> 1.6
    avifile-shareware.patch -> 1.2

diff --git a/avifile-amfix.patch b/avifile-amfix.patch
index 51717b8ca29ae371cbc4c90856b313e917a438f7..9b99f7becc3a7da7eeff3192da182f8b3d5df5a5 100644 (file)
--- a/avifile-amfix.patch
+++ b/avifile-amfix.patch
@@ -1,26 +1,23 @@
---- avifile-0.6/configure.in.orig      Mon Oct  1 20:32:07 2001
-+++ avifile-0.6/configure.in   Tue Oct  2 00:11:16 2001
-@@ -61,6 +61,7 @@
- dnl new automake doesn't like it  
- dnl but its absence breaks old automake ( 1.4 )
- AM_PROG_LIBTOOL
+diff -urN avifile0.6-20011220.orig/configure.in avifile0.6-20011220/configure.in
+--- avifile0.6-20011220.orig/configure.in      Sun Jan 20 17:15:14 2002
++++ avifile0.6-20011220/configure.in   Sun Jan 20 17:17:59 2002
+@@ -83,6 +83,7 @@
+ dnl automatic updating of libtool configuration files
+ dnl not needed with automake AC_SUBST(LIBTOOL_DEPS) 
+ dnl using rather hack for .lo creation AM_PROG_AS
 +AM_PROG_AS
  
- dnl Checks for libraries.
- dnl Replace `main' with a function in -ldl:
---- avifile-0.6/plugins/libwin32/loader/Makefile.am.orig       Fri Aug 17 14:49:21 2001
-+++ avifile-0.6/plugins/libwin32/loader/Makefile.am    Tue Oct  2 00:18:32 2001
-@@ -1,11 +1,11 @@
+ 
+ dnl 
+diff -urN avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am avifile0.6-20011220/plugins/libwin32/loader/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am       Sun Jan 20 17:15:14 2002
++++ avifile0.6-20011220/plugins/libwin32/loader/Makefile.am    Sun Jan 20 17:19:21 2002
+@@ -1,7 +1,7 @@
+ SUBDIRS = dshow wine 
  noinst_LTLIBRARIES = libloader.la
  libloader_la_SOURCES = afl.c driver.c elfdll.c ext.c module.c \
-- pe_image.c pe_resource.c registry.c resource.c win32.c
-+ pe_image.c pe_resource.c registry.c resource.c win32.c stubs.s
+- pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c 
++ pe_image.c pe_resource.c registry.c resource.c win32.c ldt_keeper.c stubs.s
  
  # ldt_keeper.c is not used here !! this is not a bug 
  # it's used in lib/common/ldt_keeper.cpp
- 
--libloader_la_LIBADD = stubs.lo
-+#libloader_la_LIBADD = stubs.lo
- noinst_HEADERS = win32.h wineacm.h loader.h ext.h driver.h com.h registry.h ldt_keeper.h
- 
- 

diff --git a/avifile-deplib.patch b/avifile-deplib.patch
index 53726bb990d9a093cc57cb5cd8d4a533104ef8f5..6b685b4d729ed3d0a08dcc6496c5755b2604950c 100644 (file)
--- a/avifile-deplib.patch
+++ b/avifile-deplib.patch
@@ -1,108 +1,111 @@
-diff -Nur avifile-0.6.orig/plugins/libac3pass/Makefile.am avifile-0.6/plugins/libac3pass/Makefile.am
---- avifile-0.6.orig/plugins/libac3pass/Makefile.am    Tue Aug 21 18:08:30 2001
-+++ avifile-0.6/plugins/libac3pass/Makefile.am Tue Oct  2 21:13:04 2001
-@@ -3,7 +3,7 @@
+diff -urN avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am avifile0.6-20011220/plugins/libac3pass/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am    Fri Jan  4 11:40:17 2002
++++ avifile0.6-20011220/plugins/libac3pass/Makefile.am Sun Jan 20 17:00:57 2002
+@@ -2,6 +2,7 @@
+ noinst_HEADERS = ac3-iec958.h fillplugins.h
  
  libac3pass_la_SOURCES = ac3-iec958.c libac3pass.cpp
- 
--libac3pass_la_LIBADD =
 +libac3pass_la_LIBADD = ../../lib/libaviplay.la -lstdc++
- libac3pass_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
+ libac3pass_la_LDFLAGS = -module -avoid-version 
+ #-release $(LT_RELEASE)
  
- CLEANFILES = play-ac3
-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 Aug  9 18:54:04 2001
-+++ avifile-0.6/plugins/libaudiodec/Makefile.am        Tue Oct  2 21:13:16 2001
+diff -urN avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am avifile0.6-20011220/plugins/libaudiodec/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am   Fri Jan  4 11:40:15 2002
++++ avifile0.6-20011220/plugins/libaudiodec/Makefile.am        Sun Jan 20 17:07:16 2002
 @@ -3,7 +3,7 @@
        gsm61dec.cpp pcm.cpp aulaw.cpp xa_gsm.c
  noinst_HEADERS = ac3.h adpcm.h adpcm_impl.h gsm61dec.h pcm.h xa_gsm.h \
        xa_gsm_state.h aulaw.h fillplugins.h
--libaudiodec_la_LIBADD = @AC3_LIBADD@
-+libaudiodec_la_LIBADD = @AC3_LIBADD@ ../../lib/libaviplay.la -lstdc++
- libaudiodec_la_LDFLAGS = @AC3_LIBS@ @AC3_LDADD@ -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
+-libaudiodec_la_LIBADD = $(AC3_LIBADD)
++libaudiodec_la_LIBADD = $(AC3_LIBADD) ../../lib/libaviplay.la -lstdc++
+ libaudiodec_la_LDFLAGS = $(AC3_LIBS) $(AC3_LDADD) -module -avoid-version 
+ #-release $(LT_RELEASE)
  
- CXXFLAGS = @CXXFLAGS@ @AC3_CFLAGS@
-diff -Nur avifile-0.6.orig/plugins/libdivx4/Makefile.am avifile-0.6/plugins/libdivx4/Makefile.am
---- avifile-0.6.orig/plugins/libdivx4/Makefile.am      Tue Aug 21 19:34:22 2001
-+++ avifile-0.6/plugins/libdivx4/Makefile.am   Tue Oct  2 21:13:41 2001
-@@ -1,6 +1,7 @@
- pkglib_LTLIBRARIES=libdivx4.la
- libdivx4_la_SOURCES=divx4.cpp
- libdivx4_la_LDFLAGS=-L/usr/local/lib -module -ldivxdecore -ldivxencore -release $(LT_RELEASE) -version-info $(LT_VERSION)
-+libdivx4_la_LIBADD=../../lib/libaviplay.la -lstdc++
- CXXFLAGS=-I$(top_srcdir)/include -g -DLINUX
- noinst_HEADERS=fillplugins.h
- noinst_PROGRAMS=test 
-diff -Nur avifile-0.6.orig/plugins/libffmpeg/Makefile.am avifile-0.6/plugins/libffmpeg/Makefile.am
---- avifile-0.6.orig/plugins/libffmpeg/Makefile.am     Thu Aug  9 18:54:05 2001
-+++ avifile-0.6/plugins/libffmpeg/Makefile.am  Tue Oct  2 21:14:02 2001
-@@ -2,7 +2,7 @@
- pkglib_LTLIBRARIES = libffmpeg.la
+diff -urN avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am avifile0.6-20011220/plugins/libdivx4/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am      Fri Jan  4 11:40:16 2002
++++ avifile0.6-20011220/plugins/libdivx4/Makefile.am   Sun Jan 20 17:08:20 2002
+@@ -3,7 +3,7 @@
+ DIVX4LIBS = -L/usr/local/lib -ldivxdecore -ldivxencore
+ 
+ libdivx4_la_SOURCES = divx4.cpp
+-libdivx4_la_LIBADD = $(DIVX4LIBS)
++libdivx4_la_LIBADD = $(DIVX4LIBS) ../../lib/libaviplay.la -lstdc++
+ libdivx4_la_LDFLAGS = -module -avoid-version
+ AM_CXXFLAGS = -DLINUX
+ noinst_HEADERS = fillplugins.h
+diff -urN avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am avifile0.6-20011220/plugins/libffmpeg/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am     Fri Jan  4 11:40:16 2002
++++ avifile0.6-20011220/plugins/libffmpeg/Makefile.am  Sun Jan 20 17:09:09 2002
+@@ -4,7 +4,7 @@
  noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h fillplugins.h bswap.h
  libffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.cpp 
+ #\  FFVideoEncoder.cpp
 -libffmpeg_la_LIBADD = libavcodec/libavcodec.la
 +libffmpeg_la_LIBADD = libavcodec/libavcodec.la ../../lib/libaviplay.la -lstdc++
- libffmpeg_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
+ libffmpeg_la_LDFLAGS = -module -avoid-version 
+ #-release $(LT_RELEASE)
  
- #
-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 Aug  9 18:54:05 2001
-+++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Tue Oct  2 21:14:16 2001
-@@ -2,5 +2,5 @@
+diff -urN avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am   Fri Jan  4 11:40:17 2002
++++ avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am        Sun Jan 20 17:10:38 2002
+@@ -2,7 +2,7 @@
  pkglib_LTLIBRARIES = libmp3lame_audioenc.la
  noinst_HEADERS = mp3encoder.h fillplugins.h
  libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp 
 -libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la
 +libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la ../../lib/libaviplay.la -lstdc++
- libmp3lame_audioenc_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
-diff -Nur avifile-0.6.orig/plugins/libmp3lamebin_audioenc/Makefile.am avifile-0.6/plugins/libmp3lamebin_audioenc/Makefile.am
---- avifile-0.6.orig/plugins/libmp3lamebin_audioenc/Makefile.am        Thu Aug  9 18:54:05 2001
-+++ avifile-0.6/plugins/libmp3lamebin_audioenc/Makefile.am     Tue Oct  2 21:14:40 2001
-@@ -2,7 +2,7 @@
- noinst_HEADERS = fillplugins.h lame.h lameencoder.h
- libmp3lamebin_audioenc_la_SOURCES = audioencoder.cpp lameencoder.cpp
- libmp3lamebin_audioenc_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
--
+ libmp3lame_audioenc_la_LDFLAGS = -module -avoid-version 
+ #-release $(LT_RELEASE)
+ MAINTAINERCLEANFILES = Makefile.in
+diff -urN avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am        Fri Jan  4 11:40:17 2002
++++ avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am     Sun Jan 20 17:11:17 2002
+@@ -4,6 +4,7 @@
+ libmp3lamebin_audioenc_la_LDFLAGS = -module -avoid-version 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
 +libmp3lamebin_audioenc_la_LIBADD = ../../lib/libaviplay.la -lstdc++
  #
- # only lame.h header from whole LAME project is here
+ # only lame.h header from the whole LAME project is here
  #
-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 Aug  9 18:54:05 2001
-+++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Tue Oct  2 21:15:19 2001
-@@ -3,10 +3,10 @@
+diff -urN avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am      Fri Jan  4 11:40:16 2002
++++ avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am   Sun Jan 20 17:12:59 2002
+@@ -3,12 +3,12 @@
        huffmantable.cpp mpeglayer1.cpp mpeglayer2.cpp mpeglayer3.cpp \
        mpegtable.cpp mpegtoraw.cpp
- libmpeg_audiodec_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
+ libmpeg_audiodec_la_LDFLAGS = -module -avoid-version 
 +libmpeg_audiodec_la_LIBADD = ../../lib/libaviplay.la -lstdc++
+ #-release $(LT_RELEASE)
  noinst_HEADERS = mpegsound.h mpegsound_locals.h fillplugins.h
  
  # currently it has to be compiled with optimalizations (inline has to work)
 -OPTFLG = -O2 -ffast-math -fomit-frame-pointer -funroll-loops
  #-D__NO_STRING_INLINES -DDEBUG
  # -finline-functions 
--CXXFLAGS = $(OPTFLG) @CXXFLAGS@ 
-+CXXFLAGS = @CXXFLAGS@ 
-diff -Nur avifile-0.6.orig/plugins/libvorbis/Makefile.am avifile-0.6/plugins/libvorbis/Makefile.am
---- avifile-0.6.orig/plugins/libvorbis/Makefile.am     Tue Sep  4 22:28:57 2001
-+++ avifile-0.6/plugins/libvorbis/Makefile.am  Tue Oct  2 21:15:32 2001
-@@ -3,6 +3,6 @@
- 
+-AM_CXXFLAGS = $(OPTFLG)
++AM_CXXFLAGS = @CXXFLAGS@
+ MAINTAINERCLEANFILES = Makefile.in
+diff -urN avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am avifile0.6-20011220/plugins/libvorbis/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am     Fri Jan  4 11:40:17 2002
++++ avifile0.6-20011220/plugins/libvorbis/Makefile.am  Sun Jan 20 17:13:34 2002
+@@ -1,6 +1,6 @@
+ pkglib_LTLIBRARIES = libvorbis_audio.la
+ noinst_HEADERS = fillplugins.h
  libvorbis_audio_la_SOURCES = libvorbis.cpp
- 
 -libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis
 +libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis ../../lib/libaviplay.la -lstdc++
- ##libvorbis_audio_la_LIBADD = /usr/local/lib/libvorbisfile.a /usr/local/lib/libvorbis.a -logg
- libvorbis_audio_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
-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 Aug  9 18:54:05 2001
-+++ avifile-0.6/plugins/libwin32/Makefile.am   Tue Oct  2 21:15:45 2001
-@@ -8,7 +8,7 @@
-   DirectShow/libds_filter.la \
+ libvorbis_audio_la_LDFLAGS = -module -avoid-version
+ MAINTAINERCLEANFILES = Makefile.in
+diff -urN avifile0.6-20011220.orig/plugins/libwin32/Makefile.am avifile0.6-20011220/plugins/libwin32/Makefile.am
+--- avifile0.6-20011220.orig/plugins/libwin32/Makefile.am      Fri Jan  4 11:40:16 2002
++++ avifile0.6-20011220/plugins/libwin32/Makefile.am   Sun Jan 20 17:14:10 2002
+@@ -7,7 +7,7 @@
+ libwin32_la_LIBADD = \
    audiodec/libaudiodec.la \
    loader/libloader.la \
 -  videocodec/libvideocodec.la
 +  videocodec/libvideocodec.la ../../lib/libaviplay.la -lstdc++
  
- libwin32_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
+ libwin32_la_LDFLAGS = -module -avoid-version
  

diff --git a/avifile-shareware.patch b/avifile-shareware.patch
index 267b42e5edcc3a3ed5538197e3945bb9b0691085..2bc4c9ca047ff501edb3c6e2b8f5bef80869dcaa 100644 (file)
--- a/avifile-shareware.patch
+++ b/avifile-shareware.patch
@@ -1,18 +1,18 @@
---- avifile-0.6.0/plugins/libwin32/loader/win32.c~     Sat Jan 20 01:08:03 2001
-+++ avifile-0.6.0/plugins/libwin32/loader/win32.c      Wed Jan 24 00:31:28 2001
-@@ -1728,7 +1728,7 @@
+--- avifile0.6-20011220/plugins/libwin32/loader/win32.c        Sun Jan 20 16:39:53 2002
++++ avifile0.6-20011220/plugins/libwin32/loader/win32.c.new    Sun Jan 20 16:53:14 2002
+@@ -2573,7 +2573,7 @@
      local_time=tv.tv_sec;
      local_tm=localtime(&local_time);
-     
+ 
 -    systime->wYear = local_tm->tm_year + 1900;
 +    systime->wYear = 1999; /* local_tm->tm_year + 1900; */
      systime->wMonth = local_tm->tm_mon + 1;
      systime->wDayOfWeek = local_tm->tm_wday;
      systime->wDay = local_tm->tm_mday;
-@@ -1749,7 +1749,7 @@
+@@ -2599,7 +2599,7 @@
      local_time=tv.tv_sec;
      local_tm=gmtime(&local_time);
-     
+ 
 -    systime->wYear = local_tm->tm_year + 1900;
 +    systime->wYear = 1999; /* local_tm->tm_year + 1900; */
      systime->wMonth = local_tm->tm_mon + 1;