From 256e37d641e87456032dc9cc7e142572da5adbc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 19 Feb 2001 13:56:22 +0000 Subject: [PATCH] - updated to beta4 Changed files: avifile-am_fix.patch -> 1.2 avifile-opt.patch -> 1.2 --- avifile-am_fix.patch | 35 ++++++++++++++++++++++++++++ avifile-opt.patch | 54 ++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/avifile-am_fix.patch b/avifile-am_fix.patch index 5a9d49c..898b4a8 100644 --- a/avifile-am_fix.patch +++ b/avifile-am_fix.patch @@ -43,3 +43,38 @@ -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-opt.patch b/avifile-opt.patch index c912966..e802d23 100644 --- a/avifile-opt.patch +++ b/avifile-opt.patch @@ -1,6 +1,6 @@ -diff -ur avifile-0.6.0.orig/configure.in avifile-0.6.0/configure.in ---- avifile-0.6.0.orig/configure.in Mon Jan 22 08:09:41 2001 -+++ avifile-0.6.0/configure.in Wed Jan 24 16:42:49 2001 +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) @@ -13,9 +13,9 @@ diff -ur avifile-0.6.0.orig/configure.in avifile-0.6.0/configure.in USE_QT=1 USE_QTRECOMP=1 -diff -ur 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 Mon Jan 22 07:53:27 2001 -+++ avifile-0.6.0/lib/aviplay/Makefile.am Wed Jan 24 16:38:44 2001 +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 @@ -25,9 +25,9 @@ diff -ur avifile-0.6.0.orig/lib/aviplay/Makefile.am avifile-0.6.0/lib/aviplay/Ma LIBS= noinst_HEADERS=RegAccess.h audio.h aviplay2.h aviplay_impl.h -diff -ur 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 16 21:57:12 2001 -+++ avifile-0.6.0/lib/aviread/Makefile.am Wed Jan 24 16:38:59 2001 +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 @@ -36,18 +36,18 @@ diff -ur avifile-0.6.0.orig/lib/aviread/Makefile.am avifile-0.6.0/lib/aviread/Ma +CXXFLAGS=-I../../include -Wno-multichar LIBS= -diff -ur 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 Mon Jan 22 06:13:32 2001 -+++ avifile-0.6.0/lib/common/Makefile.am Wed Jan 24 16:39:14 2001 +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 -ur avifile-0.6.0.orig/player/Makefile.am avifile-0.6.0/player/Makefile.am ---- avifile-0.6.0.orig/player/Makefile.am Thu Jan 18 01:30:20 2001 -+++ avifile-0.6.0/player/Makefile.am Wed Jan 24 16:39:43 2001 +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= @@ -57,9 +57,9 @@ diff -ur avifile-0.6.0.orig/player/Makefile.am avifile-0.6.0/player/Makefile.am MOC=@MOC@ UIC=@UIC@ -diff -ur 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 16 21:57:41 2001 -+++ avifile-0.6.0/plugins/libmp3lame_audioenc/lame3.70/Makefile.am Wed Jan 24 16:40:46 2001 +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 @@ -76,10 +76,10 @@ diff -ur avifile-0.6.0.orig/plugins/libmp3lame_audioenc/lame3.70/Makefile.am avi -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 -ur 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 22 02:17:46 2001 -+++ avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am Wed Jan 24 16:40:58 2001 -@@ -5,6 +5,6 @@ +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 @@ -87,15 +87,15 @@ diff -ur avifile-0.6.0.orig/plugins/libmpeg_audiodec/Makefile.am avifile-0.6.0/p +CXXFLAGS=-I../../include -fno-exceptions LIBS= -diff -ur 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 Sun Jan 21 03:33:55 2001 -+++ avifile-0.6.0/plugins/libwin32/loader/Makefile.am Wed Jan 24 16:41:33 2001 +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 -+-D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf +--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 -- 2.44.0