4415f94b09c729a5db8730f91e3efc5e avifile-0.6-20010323.tar.gz

Changed files:
    avifile-am_fix.patch -> 1.3
    avifile-deplib.patch -> 1.2
    avifile-opt.patch -> 1.3

diff --git a/avifile-am_fix.patch b/avifile-am_fix.patch
deleted file mode 100644 (file)
index 898b4a8..0000000
--- a/avifile-am_fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- avifile-0.6.0/samples/artsplug/Makefile.am.wiget   Fri Jan 26 17:45:19 2001
-+++ avifile-0.6.0/samples/artsplug/Makefile.am Fri Jan 26 17:32:27 2001
-@@ -1,5 +1,6 @@
- # This file you have to edit. Change the name here
- 
-+LDFLAGS=@LDFLAGS@
- #this is probably wrong.
- #mcopclassdir variable should point somewhere inside KDE installation,
- #I am not sure that .mcopclass will be found by aRts here.
---- avifile-0.6.0/samples/Makefile.am.wiget    Fri Jan 26 17:18:31 2001
-+++ avifile-0.6.0/samples/Makefile.am  Fri Jan 26 17:24:14 2001
-@@ -2,9 +2,9 @@
- 
- EXTRA_SUBDIRS=
- if AM_USE_JPEGLIB
--SUBDIRS_JPEG=mjpeg_plugin
-+      SUBDIRS_JPEG=mjpeg_plugin
- else
--SUBDIRS_JPEG=
-+      SUBDIRS_JPEG=
- endif    
- if AM_USE_VIDCAP
- if AM_USE_QTRECOMP
-@@ -20,14 +20,16 @@
- endif
- endif
- if AM_USE_QT
--    EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_QT) $(SUBDIRS_JPEG)
-+      EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG)
- else    
--    EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_JPEG)
-+      EXTRA_SUBDIRS=$(SUBDIRS_JPEG)
- endif
- SUBDIRS_ARTS=
- if AM_USE_ARTS
--    SUBDIRS_ARTS=artsplug
-+      SUBDIRS_ARTS=artsplug
-+else
-+      SUBDIRS_ARTS=
- endif
- SUBDIRS=$(SUBDIRS_ARTS) $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
- 
--DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin
-\ No newline at end of file
-+DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin
---- avifile-0.6.0/samples/Makefile.am~ Thu Feb 15 22:28:59 2001
-+++ avifile-0.6.0/samples/Makefile.am  Thu Feb 15 22:29:14 2001
-@@ -1,10 +1,9 @@
- BASE_SUBDIRS=misc
- 
--EXTRA_SUBDIRS=
- if AM_USE_JPEGLIB
--      SUBDIRS_JPEG=mjpeg_plugin
-+SUBDIRS_JPEG=mjpeg_plugin
- else
--      SUBDIRS_JPEG=
-+SUBDIRS_JPEG=
- endif    
- if AM_USE_VIDCAP
- if AM_USE_QTRECOMP
-@@ -20,15 +19,14 @@
- endif
- endif
- if AM_USE_QT
--      EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG)
-+EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG)
- else    
--      EXTRA_SUBDIRS=$(SUBDIRS_JPEG)
-+EXTRA_SUBDIRS=$(SUBDIRS_JPEG)
- endif
--SUBDIRS_ARTS=
- if AM_USE_ARTS
--      SUBDIRS_ARTS=artsplug
-+SUBDIRS_ARTS=artsplug
- else
--      SUBDIRS_ARTS=
-+SUBDIRS_ARTS=
- endif
- SUBDIRS=$(SUBDIRS_ARTS) $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
- 

diff --git a/avifile-deplib.patch b/avifile-deplib.patch
index f8c0281ec31a31f15a5c678a56c97029a9d5e515..a2038842bd9f39af0a1b70bdd18af451a30f97db 100644 (file)
--- a/avifile-deplib.patch
+++ b/avifile-deplib.patch
@@ -1,50 +1,45 @@
-diff -urN avifile-0.6.0.org/Makefile.am avifile-0.6.0/Makefile.am
---- avifile-0.6.0.org/Makefile.am      Fri Feb 23 14:42:33 2001
-+++ avifile-0.6.0/Makefile.am  Fri Feb 23 16:36:30 2001
-@@ -1,8 +1,8 @@
- BASE_SUBDIRS = 
- if AM_USE_QT
--EXTRA_SUBDIRS = include plugins lib player samples bin doc
-+EXTRA_SUBDIRS = include lib plugins player samples bin doc
- else
--EXTRA_SUBDIRS = include plugins lib samples bin doc
-+EXTRA_SUBDIRS = include lib plugins samples bin doc
- endif
- SUBDIRS=$(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+diff -urN avifile-0.6.org/Makefile.am avifile-0.6/Makefile.am
+--- avifile-0.6.org/Makefile.am        Fri Mar 23 17:27:09 2001
++++ avifile-0.6/Makefile.am    Fri Mar 23 17:27:53 2001
+@@ -1,4 +1,4 @@
+-BASE_SUBDIRS = include plugins lib bin doc
++BASE_SUBDIRS = include lib plugins bin doc
  
-diff -urN avifile-0.6.0.org/plugins/libaudiodec/Makefile.am avifile-0.6.0/plugins/libaudiodec/Makefile.am
---- avifile-0.6.0.org/plugins/libaudiodec/Makefile.am  Fri Feb 23 14:42:33 2001
-+++ avifile-0.6.0/plugins/libaudiodec/Makefile.am      Fri Feb 23 17:06:39 2001
+ if AM_USE_QT
+ QT_SUBDIRS = player samples
+diff -urN avifile-0.6.org/plugins/libaudiodec/Makefile.am avifile-0.6/plugins/libaudiodec/Makefile.am
+--- avifile-0.6.org/plugins/libaudiodec/Makefile.am    Fri Mar 23 17:27:10 2001
++++ avifile-0.6/plugins/libaudiodec/Makefile.am        Fri Mar 23 17:27:20 2001
 @@ -7,4 +7,4 @@
- libaudiodec_la_LDFLAGS=@AC3_LIBS@ @AC3_LDADD@ -module
- CXXFLAGS=-I../../include @AC3_CFLAGS@
+ libaudiodec_la_LDFLAGS = @AC3_LIBS@ @AC3_LDADD@ -module
+ CXXFLAGS = @CXXFLAGS@ @AC3_CFLAGS@
  
 -LIBS=
 +LIBS=-L../../lib/.libs -laviplay -lstdc++
-diff -urN avifile-0.6.0.org/plugins/libmp3lame_audioenc/Makefile.am avifile-0.6.0/plugins/libmp3lame_audioenc/Makefile.am
---- avifile-0.6.0.org/plugins/libmp3lame_audioenc/Makefile.am  Fri Feb 23 14:42:33 2001
-+++ avifile-0.6.0/plugins/libmp3lame_audioenc/Makefile.am      Fri Feb 23 17:06:30 2001
-@@ -5,4 +5,4 @@
- libmp3lame_audioenc_la_LDFLAGS=-module
- CXXFLAGS=-I../../include
+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    Fri Mar 23 17:27:10 2001
++++ avifile-0.6/plugins/libmp3lame_audioenc/Makefile.am        Fri Mar 23 17:27:20 2001
+@@ -4,4 +4,4 @@
+ libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp mp3encoder.h fillplugins.h
+ libmp3lame_audioenc_la_LDFLAGS = -module
  
 -LIBS=
 +LIBS=-L../../lib/.libs -laviplay -lstdc++
-diff -urN avifile-0.6.0.org/plugins/libmpeg_audiodec/Makefile.am avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am
---- avifile-0.6.0.org/plugins/libmpeg_audiodec/Makefile.am     Fri Feb 23 14:42:33 2001
-+++ avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am Fri Feb 23 17:06:23 2001
-@@ -6,4 +6,4 @@
- noinst_HEADERS=mpegsound.h mpegsound_locals.h fillplugins.h
- CXXFLAGS=-I../../include -fno-exceptions
+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       Fri Mar 23 17:27:10 2001
++++ avifile-0.6/plugins/libmpeg_audiodec/Makefile.am   Fri Mar 23 17:27:20 2001
+@@ -9,4 +9,4 @@
+ 
+ CPPFLAGS = @CPPFLAGS@
  
 -LIBS=
 +LIBS=-L../../lib/.libs -laviplay -lstdc++
-diff -urN avifile-0.6.0.org/plugins/libwin32/Makefile.am avifile-0.6.0/plugins/libwin32/Makefile.am
---- avifile-0.6.0.org/plugins/libwin32/Makefile.am     Fri Feb 23 14:42:33 2001
-+++ avifile-0.6.0/plugins/libwin32/Makefile.am Fri Feb 23 17:06:13 2001
-@@ -6,4 +6,4 @@
-   audiodec/libaudiodec.la DirectShow/libds_filter.la
- libwin32_la_LDFLAGS = -module -version-info 0:0:0
- CXXFLAGS=-I- -I. -I../../include -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
--LIBS= @AVILIBDEPLIB@
-+LIBS= -L../../lib/.libs -laviplay @AVILIBDEPLIB@ -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       Fri Mar 23 17:27:10 2001
++++ avifile-0.6/plugins/libwin32/Makefile.am   Fri Mar 23 17:28:27 2001
+@@ -13,4 +13,4 @@
+ 
+ CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
+ 
+-LIBS = @AVILIBDEPLIB@
++LIBS = @AVILIBDEPLIB@  -L../../lib/.libs -laviplay -lstdc++

diff --git a/avifile-opt.patch b/avifile-opt.patch
deleted file mode 100644 (file)
index e802d23..0000000
--- a/avifile-opt.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -urN avifile-0.6.0.orig/configure.in avifile-0.6.0/configure.in
---- avifile-0.6.0.orig/configure.in    Fri Jan 26 17:57:14 2001
-+++ avifile-0.6.0/configure.in Wed Feb 14 16:53:47 2001
-@@ -79,11 +79,6 @@
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(ftime gettimeofday strdup strstr)
- 
--dnl remove me
--CFLAGS="$CFLAGS -march=i586"
--
--
--
- USE_QT=1
- USE_QTRECOMP=1
- 
-diff -urN avifile-0.6.0.orig/lib/aviplay/Makefile.am avifile-0.6.0/lib/aviplay/Makefile.am
---- avifile-0.6.0.orig/lib/aviplay/Makefile.am Tue Jan 23 07:16:31 2001
-+++ avifile-0.6.0/lib/aviplay/Makefile.am      Wed Feb 14 16:53:47 2001
-@@ -1,7 +1,7 @@
- noinst_LTLIBRARIES=libaviplay.la
- libaviplay_la_SOURCES=audio.cpp aviplay.cpp renderer.cpp aviplay2.cpp
- 
--CXXFLAGS=-march=i586 -I../../include @SDL_CFLAGS@ @X_INCLUDES@
-+CXXFLAGS=-I../../include @SDL_CFLAGS@ @X_INCLUDES@
- 
- LIBS=
- noinst_HEADERS=RegAccess.h audio.h aviplay2.h aviplay_impl.h
-diff -urN avifile-0.6.0.orig/lib/aviread/Makefile.am avifile-0.6.0/lib/aviread/Makefile.am
---- avifile-0.6.0.orig/lib/aviread/Makefile.am Tue Jan 23 07:16:15 2001
-+++ avifile-0.6.0/lib/aviread/Makefile.am      Wed Feb 14 16:53:47 2001
-@@ -1,6 +1,6 @@
- noinst_LTLIBRARIES=libaviread.la
- libaviread_la_SOURCES=asfinput.cpp AsfReadHandler.cpp AviReadHandler.cpp AviRead.cpp Cache.cpp
- noinst_HEADERS=asfinput.h AsfReadHandler.h AviReadHandler.h AviRead.h Cache.h asffmt.h
--CXXFLAGS=-I../../include -Wno-multichar -fno-omit-frame-pointer
-+CXXFLAGS=-I../../include -Wno-multichar
- 
- LIBS=
-diff -urN avifile-0.6.0.orig/lib/common/Makefile.am avifile-0.6.0/lib/common/Makefile.am
---- avifile-0.6.0.orig/lib/common/Makefile.am  Tue Jan 23 07:16:11 2001
-+++ avifile-0.6.0/lib/common/Makefile.am       Wed Feb 14 16:53:47 2001
-@@ -1,4 +1,4 @@
- noinst_LTLIBRARIES=libcommon.la
- libcommon_la_SOURCES=mmx.cpp image.cpp impl_video.cpp impl_audio.cpp util.cpp ldt_keeper.cpp
--CXXFLAGS=-I../../include -fno-exceptions -Os
-+CXXFLAGS=-I../../include -fno-exceptions
- 
-diff -urN avifile-0.6.0.orig/player/Makefile.am avifile-0.6.0/player/Makefile.am
---- avifile-0.6.0.orig/player/Makefile.am      Tue Jan 23 07:16:42 2001
-+++ avifile-0.6.0/player/Makefile.am   Wed Feb 14 16:53:47 2001
-@@ -29,7 +29,7 @@
- DEFINES=
- 
- CXXFLAGS=-I../include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@ \
--    -DSHARE_PATH=\"@datadir@/avifile\" -DWIN32_PATH=\"@WIN32_PATH@\" -march=i586
-+    -DSHARE_PATH=\"@datadir@/avifile\" -DWIN32_PATH=\"@WIN32_PATH@\"
-     
- MOC=@MOC@
- UIC=@UIC@
-diff -urN avifile-0.6.0.orig/plugins/libmp3lame_audioenc/lame3.70/Makefile.am avifile-0.6.0/plugins/libmp3lame_audioenc/lame3.70/Makefile.am
---- avifile-0.6.0.orig/plugins/libmp3lame_audioenc/lame3.70/Makefile.am        Tue Jan 23 07:15:16 2001
-+++ avifile-0.6.0/plugins/libmp3lame_audioenc/lame3.70/Makefile.am     Wed Feb 14 16:53:47 2001
-@@ -31,7 +31,7 @@
-         interface.c \
-         main.c 
- 
--CC_OPTS =  -O3 -fomit-frame-pointer -funroll-loops -ffast-math  -finline-functions -Wall
-+CC_OPTS = -fomit-frame-pointer -funroll-loops -ffast-math  -finline-functions -Wall
- 
- # 10/99 added -D__NO_MATH_INLINES to fix a bug in *all* versions of
- # gcc 2.8+ as of 10/99.  
-@@ -44,4 +44,4 @@
- get_audio.h gpkplotting.h gtkanal.h huffman.h id3tag.h ieeefloat.h\
- l3bitstream-pvt.h l3bitstream.h l3side.h lame.h machine.h mpg123.h\
- mpglib.h newmdct.h portableio.h psymodel.h quantize-pvt.h quantize.h\
--reservoir.h rtp.h tables.h timestatus.h util.h version.h 
-\ No newline at end of file
-+reservoir.h rtp.h tables.h timestatus.h util.h version.h 
-diff -urN avifile-0.6.0.orig/plugins/libmpeg_audiodec/Makefile.am avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am
---- avifile-0.6.0.orig/plugins/libmpeg_audiodec/Makefile.am    Mon Jan 29 12:37:31 2001
-+++ avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am Wed Feb 14 16:53:47 2001
-@@ -4,6 +4,6 @@
-  mpegtoraw.cpp
- libmpeg_audiodec_la_LDFLAGS=-module
- noinst_HEADERS=mpegsound.h mpegsound_locals.h fillplugins.h
--CXXFLAGS=-I../../include -O2 -fno-exceptions
-+CXXFLAGS=-I../../include -fno-exceptions
- 
- LIBS=
-diff -urN avifile-0.6.0.orig/plugins/libwin32/loader/Makefile.am avifile-0.6.0/plugins/libwin32/loader/Makefile.am
---- avifile-0.6.0.orig/plugins/libwin32/loader/Makefile.am     Wed Jan 31 20:32:28 2001
-+++ avifile-0.6.0/plugins/libwin32/loader/Makefile.am  Wed Feb 14 16:54:29 2001
-@@ -4,7 +4,7 @@
- libloader_la_LIBADD=stubs.lo
- noinst_HEADERS=win32.h wineacm.h loader.h
- CFLAGS=-I. -I../../../include -DWIN32_PATH=\"@WIN32_PATH@\" \
---D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -fno-inline -fcaller-saves
-+-D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -fcaller-saves
- 
- LIBS=
- EXTRA_DIST=stubs.s