- updated nolibtooltest patch for current avifile

- updated etc_dir patch to current policy (s/ETC_DIR/HOME_DIR/, leave dots)
- added system-libmad patch (but something is wrong with .mp3 files in this
  avifile version, it doesn't even load mad plugin)
- disabled building lame3.70 plugin, one using newer system libmp3lame is enough
- removed useless *.la for plugins
- removed bogus, no longer existing vidix-nvidia package

Changed files:
    avifile-etc_dir.patch -> 1.2
    avifile-nolibtooltest.patch -> 1.2
    avifile-system-libmad.patch -> 1.1
    avifile.spec -> 1.150

diff --git a/avifile-etc_dir.patch b/avifile-etc_dir.patch
index e3a5be738e961134792d2b897fc6c0ff3d54345d..4dc8d752a900edeffc85a0cf6d79e769b687d912 100644 (file)
--- a/avifile-etc_dir.patch
+++ b/avifile-etc_dir.patch
@@ -1,16 +1,13 @@
 diff -Nru avifile0.7-0.7.32/lib/common/Registry.cpp avifile0.7-0.7.32.new/lib/common/Registry.cpp
 --- avifile0.7-0.7.32/lib/common/Registry.cpp  Fri Oct  4 09:07:33 2002
 +++ avifile0.7-0.7.32.new/lib/common/Registry.cpp      Sun Mar 23 13:59:08 2003
-@@ -33,15 +33,22 @@
+@@ -33,11 +33,15 @@
      if (!config)
      {
        char* home;
 -      home = getenv("HOME");
--      if (home == 0)
-+      int etc_dir_used = 0;
-+      home = getenv("ETC_DIR");
-+      if (home) etc_dir_used = 1;
-+      else
++      home = getenv("HOME_ETC");
+       if (home == 0)
        {
 -          struct passwd* pwent = getpwuid(getuid());
 -          home = pwent->pw_dir;
@@ -23,9 +20,3 @@ diff -Nru avifile0.7-0.7.32/lib/common/Registry.cpp avifile0.7-0.7.32.new/lib/co
        }
        avm::string s(home);
        if (!sConfigDir)
--          s += "/.avm";
-+              if (etc_dir_used) s+= "/avm";
-+          else s += "/.avm";
-       else
-       {
-           s += "/";

diff --git a/avifile-nolibtooltest.patch b/avifile-nolibtooltest.patch
index 1e62787340cae044980f74034d5f057067b4634d..0f87dbc9a2f97f2af2d14cbb47586483c73410e3 100644 (file)
--- a/avifile-nolibtooltest.patch
+++ b/avifile-nolibtooltest.patch
@@ -1,5 +1,5 @@
---- avifile0.7-0.7.34/configure.ac.orig        Sat Apr 12 00:44:20 2003
-+++ avifile0.7-0.7.34/configure.ac     Sat Apr 12 00:55:18 2003
+--- avifile0.7-0.7.37/configure.ac.orig        Sat Apr 12 00:44:20 2003
++++ avifile0.7-0.7.37/configure.ac     Sat Apr 12 00:55:18 2003
 @@ -927,11 +927,6 @@
  CFLAGS=$COPTFLAGS
  CXXFLAGS=$CXXOPTFLAGS
@@ -13,11 +13,11 @@
  AM_CONDITIONAL(AMM_USE_QT, test x$with_qt = xyes )
  AM_CONDITIONAL(AMM_USE_SDL, test "$with_sdl" = yes)
 @@ -959,7 +954,7 @@
- AM_CONDITIONAL(AMM_USE_FAST_BUILD, test x$enable_fast_build = xyes )
  AM_CONDITIONAL(AMM_USE_VIDIX, test x$enable_vidix = xyes )
  AM_CONDITIONAL(AMM_USE_LINUX, test x$enable_linux = xyes )
+ AM_CONDITIONAL(AMM_USE_FAST_BUILD, test x$enable_fast_build = xyes )
 -AM_CONDITIONAL(AMM_LINK_SHARED, test $lt_major_version -ge 1 -a $lt_minor_version -ge 4 -a $lt_micro_version -ge 3 )
 +AM_CONDITIONAL(AMM_LINK_SHARED, true )
  
- dnl Arts plugin disabled - it is unusable anyway
- dnl artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+ AM_CONDITIONAL(AMM_FF_A52BIN, test x$enable_ffmpeg_a52bin = xyes)
+ AM_CONDITIONAL(AMM_FF_FAAD, test x$have_faad = xyes )

diff --git a/avifile-system-libmad.patch b/avifile-system-libmad.patch
new file mode 100644 (file)
index 0000000..f1e2e7d
--- /dev/null
+++ b/avifile-system-libmad.patch
@@ -0,0 +1,16 @@
+--- avifile0.7-0.7.37/configure.ac.orig        2003-07-10 20:34:58.000000000 +0200
++++ avifile0.7-0.7.37/configure.ac     2003-07-10 21:13:57.000000000 +0200
+@@ -747,10 +747,11 @@
+     AC_ARG_ENABLE(libmad, [  --enable-libmad         use system MAD library. (autodetected)],
+                 [], enable_libmad=yes)
+     MAD_LIBS="-lmad"
++    if test x$enable_libmad != xyes; then
+     save_LIBS=$LIBS
+-dnl FIXME AC_CHECK_LIB(mad, mad_stream_init, [], [ MAD_LIBS=""; enable_libmad=no ])
+-    enable_libmad=no
++    AC_CHECK_LIB(mad, mad_stream_init, [], [ MAD_LIBS=""; enable_libmad=no ])
+     LIBS=$save_LIBS
++    fi
+ fi
+ AC_SUBST(MAD_LIBS)
+ 

diff --git a/avifile.spec b/avifile.spec
index 073c12a88c6bbed7fc4f015ee28b00cc918ccfd5..d7871268b2c912bca77f173497a59dec55ef731a 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -26,6 +26,7 @@ Patch2:               %{name}-fix-keys.patch
 Patch3:                %{name}-etc_dir.patch
 Patch4:                %{name}-nolibtooltest.patch
 Patch5:                %{name}-aviplay_h.patch
+Patch6:                %{name}-system-libmad.patch
 URL:           http://avifile.sourceforge.net/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: XFree86-devel
@@ -34,12 +35,15 @@ BuildRequires:      audiofile-devel
 BuildRequires: autoconf
 BuildRequires: automake
 %{?_with_divx:BuildRequires:   divx4linux-devel}
+BuildRequires: faad2-devel
 BuildRequires: lame-libs-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libmad-devel
 BuildRequires: libogg-devel
 BuildRequires: libtool >= 1:1.4.3
 BuildRequires: libvorbis-devel >= 1:1.0
 %{?_with_nas:BuildRequires:    nas-devel}
+BuildRequires: pkgconfig
 %{?!_without_qt:BuildRequires: qt-devel >= 2.0.0}
 BuildRequires: unzip
 BuildRequires: xft-devel
@@ -47,6 +51,7 @@ BuildRequires:        xft-devel
 BuildRequires: xvid-devel
 %endif
 BuildConflicts:        wine-devel
+Obsoletes:     avifile-vidix-nvidia
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -197,6 +202,9 @@ Summary:    MP3 audio encoder plugin
 Summary(pl):   Plugin enkoduj±cy d¼wiêk w formacie MP3
 Group:         X11/Libraries
 Requires:      %{name} = %{epoch}:%{version}
+# this library is dlopened
+Requires:      libmp3lame.so.0
+Requires:      lame-libs
 
 %description lame_audioenc
 Plugin for mp3 encoding capability of avirecompress tool.
@@ -309,13 +317,17 @@ Sterownik VIDIX dla kart graficznych Permedia.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
-%build
-%{__autoconf}
+# configure.ac is enough
+rm configure.in
 
-cd plugins/libmad/libmad
+%build
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
-cd ../../..
+%{__autoheader}
+%{__automake}
 
 # This is The WRONG Way (tm)
 %if %{!?_without_qt:1}%{?_without_qt:0}
@@ -330,10 +342,13 @@ for f in $GEN_MOC; do moc -o "${f%.[!.]*}.moc" "$f"; done
        --with-qt-includes=%{_includedir}/qt \
        --with-qt-libraries=%{_libdir} \
        --enable-a52 \
-       --enable-release \
+       %{?_with_divx:--enable-divx4} \
        --enable-ffmpeg \
        --enable-ffmpeg-a52 \
-       %{?_with_divx:--enable-divx4} \
+       --enable-lamebin \
+       --disable-lame \
+       --enable-libmad \
+       --enable-release \
 %ifarch i586 i686 athlon
        --enable-x86opt \
 %else
@@ -358,6 +373,9 @@ cp -f include/fourcc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 install bin/test.png $RPM_BUILD_ROOT%{_pixmapsdir}/avifile.png
 
+# avifile dlopens *.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/avifile*/{,vidix/}*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -371,13 +389,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/avifile*
 %attr(755,root,root) %{_libdir}/avifile*/audiodec.so*
-%{_libdir}/avifile*/audiodec.la
 %attr(755,root,root) %{_libdir}/avifile*/mpeg_audiodec.so*
-%{_libdir}/avifile*/mpeg_audiodec.la
 %attr(755,root,root) %{_libdir}/avifile*/ac3pass.so*
-%{_libdir}/avifile*/ac3pass.la
 %attr(755,root,root) %{_libdir}/avifile*/mjpeg.so*
-%{_libdir}/avifile*/mjpeg.la
 %ifarch %{ix86} ppc
 %dir %{_libdir}/avifile*/vidix
 %endif
@@ -386,8 +400,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/README-DEVEL*
 %attr(755,root,root) %{_bindir}/avifile-config
+%attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-%{_libdir}/lib*.so
 %{_includedir}/%{name}
 %{_aclocaldir}/*.m4
 %{_pkgconfigdir}/%{name}.pc
@@ -426,78 +440,64 @@ rm -rf $RPM_BUILD_ROOT
 %files win32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/win32.so*
-%{_libdir}/avifile*/win32.la
 %endif
 
 %files ffmpeg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/ffmpeg.so*
-%{_libdir}/avifile*/ffmpeg.la
 
 %if %{?_with_divx:1}%{!?_with_divx:0}
 %files divx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/divx*.so*
-%{_libdir}/avifile*/divx*.la
 %endif
 
 %files vorbis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vorbis*.so*
-%{_libdir}/avifile*/vorbis*.la
 
 %files mad
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/mad*.so*
-%{_libdir}/avifile*/mad*.la
 
 %files lame_audioenc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/mp3lamebin_audioenc.so*
-%attr(755,root,root) %{_libdir}/avifile*/mp3lame_audioenc.so*
-%{_libdir}/avifile*/mp3lamebin_audioenc.la
-%{_libdir}/avifile*/mp3lame_audioenc.la
+#%attr(755,root,root) %{_libdir}/avifile*/mp3lame_audioenc.so*
 
 %ifarch %{ix86} ppc
 %files xvid
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/xvid.so*
-%{_libdir}/avifile*/xvid.la
 %endif
 
 %ifnarch ppc
 %files vidix-driver-fb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/libgenfb.so*
-%{_libdir}/avifile*/vidix/libgenfb.la
 
 %files vidix-driver-mach64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/libmach64.so*
-%{_libdir}/avifile*/vidix/libmach64.la
 
 %files vidix-driver-rage128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/librage128.so*
-%{_libdir}/avifile*/vidix/librage128.la
 
 %files vidix-driver-radeon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/libradeon.so*
-%{_libdir}/avifile*/vidix/libradeon.la
 
 %files vidix-driver-mga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/libmga*.so*
-%{_libdir}/avifile*/vidix/libmga*.la
 
-%files vidix-driver-nvidia
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/vidix/libnvidia.so*
-%{_libdir}/avifile*/vidix/libnvidia.la
+# "just debug driver", even removed from sources
+#%files vidix-driver-nvidia
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/avifile*/vidix/libnvidia.so*
 
 %files vidix-driver-permedia
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/vidix/libpm3.so*
-%{_libdir}/avifile*/vidix/libpm3.la
 %endif