- amfix patch, pass AS=gcc to configure - fix for stubs.s

- updated deplib patch, re-enabled avoiding relinking
  to allow building without avifile-devel installed

Changed files:
    avifile-amfix.patch -> 1.1
    avifile-deplib.patch -> 1.5
    avifile.spec -> 1.66

diff --git a/avifile-amfix.patch b/avifile-amfix.patch
new file mode 100644 (file)
index 0000000..51717b8
--- /dev/null
+++ b/avifile-amfix.patch
@@ -0,0 +1,26 @@
+--- 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
++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 @@
+ 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
+ 
+ # 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 47d28046fbdde0ec1d1968bde6ec40069555dec4..53726bb990d9a093cc57cb5cd8d4a533104ef8f5 100644 (file)
--- a/avifile-deplib.patch
+++ b/avifile-deplib.patch
@@ -1,46 +1,108 @@
-diff -urN avifile-0.6.org/Makefile.am avifile-0.6/Makefile.am
---- avifile-0.6.org/Makefile.am        Mon Apr  2 15:55:27 2001
-+++ avifile-0.6/Makefile.am    Mon Apr  2 15:55:35 2001
-@@ -1,4 +1,4 @@
--BASE_SUBDIRS = include plugins lib bin doc
-+BASE_SUBDIRS = include lib plugins bin doc
- 
- 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    Mon Apr  2 15:55:27 2001
-+++ avifile-0.6/plugins/libaudiodec/Makefile.am        Mon Apr  2 15:55:35 2001
-@@ -7,4 +7,4 @@
- libaudiodec_la_LDFLAGS = @AC3_LIBS@ @AC3_LDADD@ -module
+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 @@
+ 
+ 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)
+ 
+ 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
+@@ -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)
+ 
  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
+ noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h fillplugins.h bswap.h
+ libffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.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)
+ 
+ #
+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 @@
+ 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)
+-
++libmp3lamebin_audioenc_la_LIBADD = ../../lib/libaviplay.la -lstdc++
+ #
+ # only lame.h header from 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 @@
+       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_LIBADD = ../../lib/libaviplay.la -lstdc++
+ noinst_HEADERS = mpegsound.h mpegsound_locals.h fillplugins.h
  
--LIBS=
-+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
-@@ -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 -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
-@@ -8,4 +8,5 @@
  # currently it has to be compiled with optimalizations (inline has to work)
- CXXFLAGS = @CXXFLAGS@ -O2
+-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 @@
+ 
+ libvorbis_audio_la_SOURCES = libvorbis.cpp
  
--LIBS =
-+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
-+++ avifile-0.6/plugins/libwin32/Makefile.am   Mon Apr  2 15:55:35 2001
-@@ -14,4 +14,4 @@
+-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 \
+   audiodec/libaudiodec.la \
+   loader/libloader.la \
+-  videocodec/libvideocodec.la
++  videocodec/libvideocodec.la ../../lib/libaviplay.la -lstdc++
  
- CPPFLAGS = @CPPFLAGS@ -Iloader -Iloader/wine -Ivideocodec -Iaudiodec -IDirectShow
+ libwin32_la_LDFLAGS = -module -release $(LT_RELEASE) -version-info $(LT_VERSION)
  
--LIBS = @AVILIBDEPLIB@
-+LIBS = @AVILIBDEPLIB@  -L../../lib -laviplay -lstdc++

diff --git a/avifile.spec b/avifile.spec
index 421c5abf20c2b77db08e8a22d5270b78f513b654..c56141c50dd906b5df59760af2ac7517bc887bb6 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -14,6 +14,7 @@ Patch0:               %{name}-shareware.patch
 Patch1:                %{name}-deplib.patch
 Patch2:                %{name}-ac3.patch
 Patch3:                %{name}-size_t.patch
+Patch4:                %{name}-amfix.patch
 BuildRequires: XFree86-devel
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: ac3dec-devel >= 0.6.1
@@ -65,9 +66,10 @@ libaviplay.
 %setup -q -n avifile-%{version}
 %patch0 -p1
 # was broken and need fixing; without this xmms and avi plugin is broken
-# %patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing aclocal.m4
@@ -76,7 +78,7 @@ aclocal
 autoconf
 autoheader
 automake -a -c --foreign
-%configure CPPFLAGS="-I/usr/include/divx" \
+%configure CPPFLAGS="-I/usr/include/divx" AS="%{__cc}" \
        --with-qt-includes=%{_includedir}/qt \
        --with-libac3-path=%{_prefix} \
        --enable-release \
@@ -89,13 +91,11 @@ touch lib/dummy.cpp
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/usr/lib/win32}
 
-## avoid relinking
-#for f in plugins/libwin32/libwin32.la plugins/libaudiodec/libaudiodec.la \
-#  plugins/libmp3lame_audioenc/libmp3lame_audioenc.la \
-#  plugins/libmpeg_audiodec/libmpeg_audiodec.la ; do
-#      sed -e '/^relink_command/d' $f > $f.new
-#      mv -f $f.new $f
-#done
+# avoid relinking
+for f in plugins/*/lib*.la ; do
+       sed -e '/^relink_command/d' $f > $f.new
+       mv -f $f.new $f
+done
        
 %{__make} install \
        DESTDIR="$RPM_BUILD_ROOT"