- readded no_libnsl and system-libmad patches (NOT outdated, just updated filenames!)

Changed files:
    avifile-no_libnsl.patch -> 1.5
    avifile-system-libmad.patch -> 1.3
    avifile.spec -> 1.156

diff --git a/avifile-no_libnsl.patch b/avifile-no_libnsl.patch
new file mode 100644 (file)
index 0000000..b6e645e
--- /dev/null
+++ b/avifile-no_libnsl.patch
@@ -0,0 +1,11 @@
+--- avifile/configure.in       Tue Mar 18 13:17:08 2003
++++ avifile/configure.in~      Fri Apr  4 14:17:38 2003
+@@ -168,7 +168,7 @@
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(posix4, nanosleep)
+ AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
+ AC_CHECK_LIB(kstat, kstat_open)
+ AC_CHECK_LIB(c, lseek64, AC_DEFINE(HAVE_LSEEK64, 1, [Define if you have 'lseek64' function.]))
+ dnl AC_SUBST(LIBSOCKET)

diff --git a/avifile-system-libmad.patch b/avifile-system-libmad.patch
new file mode 100644 (file)
index 0000000..081ca3b
--- /dev/null
+++ b/avifile-system-libmad.patch
@@ -0,0 +1,16 @@
+--- avifile0.7-0.7.37/configure.in.orig        2003-07-10 20:34:58.000000000 +0200
++++ avifile0.7-0.7.37/configure.in     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 dc7338a6958ea5a04ba8aa1a05d783d6a07ac9bc..31cb9151913e6abdd008f8388ca892a65a39a2cf 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -1,4 +1,5 @@
-
+#
+# Conditional build:
 %bcond_without qt      # disables QT support
 %bcond_with divx       # enables divx4linux support (proprietary, binary-only
                        # lib)  note: if disabled, divx is decoded by ffmpeg
@@ -24,6 +25,8 @@ Patch4:               %{name}-without_qt.patch
 Patch5:                %{name}-no_aux_dir.patch
 Patch6:                %{name}-link_shared.patch
 Patch7:                %{name}-avifile_config_fix.patch
+Patch8:                %{name}-no_libnsl.patch
+Patch9:                %{name}-system-libmad.patch
 URL:           http://avifile.sourceforge.net/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: XFree86-devel
@@ -316,6 +319,8 @@ Sterownik VIDIX dla kart graficznych Permedia.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}