- opt patch: use rpmcflags in lib/common too

- lt14 patch: fix for libtool 1.4; avoid relinking
- moved *.la to devel

Changed files:
    avifile-lt14.patch -> 1.1
    avifile-opt.patch -> 1.4
    avifile.spec -> 1.44

diff --git a/avifile-lt14.patch b/avifile-lt14.patch
new file mode 100644 (file)
index 0000000..2b5b33a
--- /dev/null
+++ b/avifile-lt14.patch
@@ -0,0 +1,37 @@
+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++

diff --git a/avifile-opt.patch b/avifile-opt.patch
new file mode 100644 (file)
index 0000000..87a2344
--- /dev/null
+++ b/avifile-opt.patch
@@ -0,0 +1,9 @@
+--- avifile-0.6/lib/common/Makefile.am.orig    Fri Apr 20 18:57:42 2001
++++ avifile-0.6/lib/common/Makefile.am Thu May 24 00:07:15 2001
+@@ -12,5 +12,3 @@
+  util.cpp \
+  ldt_keeper.cpp \
+  mmx.cpp 
+-
+-CXXFLAGS=-g -O2
+\ No newline at end of file

diff --git a/avifile.spec b/avifile.spec
index 39550b55e7bd01b65742555803c51ec7b2846172..c6fde68d3a58dd91233eeb2ea3ce1054fd65f77f 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -20,6 +20,8 @@ Patch1:               %{name}-deplib.patch
 Patch2:                %{name}-ac3.patch
 Patch3:                %{name}-mga.patch
 Patch4:                %{name}-libtool.patch
+Patch5:                %{name}-opt.patch
+Patch6:                %{name}-lt14.patch
 BuildRequires: XFree86-devel
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: ac3dec-devel >= 0.6.1
@@ -65,13 +67,17 @@ libaviplay.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-rm missing
+rm -f missing
 libtoolize --copy --force
 aclocal
 autoconf
 automake -a -c --foreign
+# don't always add "-g" - it's in CXXFLAGS in %debug version
+CPPFLAGS=" "; export CPPFLAGS
 %configure \
        --with-qt-includes=%{_includedir}/qt \
        --enable-release \
@@ -85,6 +91,14 @@ gcc -c plugins/libwin32/loader/stubs.s -o plugins/libwin32/loader/stubs.lo
 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
+       
 %{__make} install \
        DESTDIR="$RPM_BUILD_ROOT"
 
@@ -108,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/asf*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/avifile
-%attr(755,root,root) %{_libdir}/avifile/lib*
+%attr(755,root,root) %{_libdir}/avifile/lib*.so*
 %{_datadir}/%{name}
 
 %files devel
@@ -116,5 +130,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/README-DEVEL*
 %attr(755,root,root) %{_bindir}/avifile-config
 %attr(755,root,root) %{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/avifile/lib*.la
 %{_libdir}/lib*.so
 %{_includedir}/%{name}