Mandrake patches from

  http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/
via Goetz Waschk who reports:
  The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative
  CFLAGS for amd64,
  the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded
  /lib to support the lib64 library dir on amd64,
  the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a
  configure option to disable directfb,
  the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same
  for linux framebuffer and
  the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't
  apply at the moment against the CVS -- demux_ogg.c was not applied.
  it includes some 64 bit pointer and other fixes for 64bit architectures.
  from Gwenole Beauchesne
I haven't tested other than apply and compile.

CVS patchset: 6174
CVS date: 2004/02/19 02:50:24

7 files changed, 10 insertions, 10 deletions

diff --git a/m4/alsa.m4 b/m4/alsa.m4
index eca833472..885b66386 100644
--- a/m4/alsa.m4
+++ b/m4/alsa.m4
@@ -47,12 +47,12 @@ AC_DEFUN([AM_PATH_ALSA],
 if test x"$enable_alsa" != "xno"; then
 
   if test x$alsa_prefix != x ; then
-    ALSA_LIBS="-L$alsa_prefix/lib"
+    ALSA_LIBS="-L$alsa_prefix/$XINE_LIBNAME"
     ALSA_STATIC_LIB="$alsa_prefix"
     ALSA_CFLAGS="-I$alsa_prefix/include"
   fi
   if test x$alsa_exec_prefix != x ; then
-    ALSA_LIBS="-L$alsa_exec_prefix/lib"
+    ALSA_LIBS="-L$alsa_exec_prefix/$XINE_LIBNAME"
     ALSA_STATIC_LIB="$alsa_exec_prefix"
     ALSA_CFLAGS="-I$alsa_exec_prefix/include"
   fi
@@ -61,7 +61,7 @@ if test x"$enable_alsa" != "xno"; then
   if test x$ALSA_STATIC_LIB != x; then
     ALSA_STATIC_LIB="$ALSA_STATIC_LIB/lib/libasound.a"
   else
-    ALSA_STATIC_LIB="/usr/lib/libasound.a"
+    ALSA_STATIC_LIB="/usr/$XINE_LIBNAME/libasound.a"
   fi
   ALSA_CFLAGS="$ALSA_CFLAGS"
 
diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4
index 88d8e84c3..f34ec5e1d 100644
--- a/m4/libFLAC.m4
+++ b/m4/libFLAC.m4
@@ -16,9 +16,9 @@ AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest       Do not try to compile
   if test "x$libFLAC_libraries" != "x" ; then
     LIBFLAC_LIBS="-L$libFLAC_libraries"
   elif test "x$libFLAC_prefix" != "x" ; then
-    LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
+    LIBFLAC_LIBS="-L$libFLAC_prefix/$XINE_LIBNAME"
   elif test "x$prefix" != "xNONE" ; then
-    LIBFLAC_LIBS="-L$prefix/lib"
+    LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
   fi
 
   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
diff --git a/m4/ogg.m4 b/m4/ogg.m4
index 0da1102a2..7f8ab808f 100644
--- a/m4/ogg.m4
+++ b/m4/ogg.m4
@@ -15,7 +15,7 @@ AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run
   if test x$ogg_prefix != x ; then
     ogg_args="$ogg_args --prefix=$ogg_prefix"
     OGG_CFLAGS="-I$ogg_prefix/include"
-    OGG_LIBS="-L$ogg_prefix/lib"
+    OGG_LIBS="-L$ogg_prefix/$XINE_LIBNAME"
   fi
 
   OGG_LIBS="$OGG_LIBS -logg"
diff --git a/m4/speex.m4 b/m4/speex.m4
index e3f1b9556..1a783cc62 100644
--- a/m4/speex.m4
+++ b/m4/speex.m4
@@ -15,7 +15,7 @@ AC_ARG_ENABLE(speextest, [  --disable-speextest       Do not try to compile and
   if test x$speex_prefix != x ; then
     speex_args="$speex_args --prefix=$speex_prefix"
     SPEEX_CFLAGS="-I$speex_prefix/include"
-    SPEEX_LIBDIR="-L$speex_prefix/lib"
+    SPEEX_LIBDIR="-L$speex_prefix/$XINE_LIBNAME"
   fi
 
   SPEEX_LIBS="$SPEEX_LIBDIR -lspeex -lm"
diff --git a/m4/theora.m4 b/m4/theora.m4
index f6aa7be79..d62547ee4 100644
--- a/m4/theora.m4
+++ b/m4/theora.m4
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(theoratest, [  --disable-theoratest       Do not try to compile an
   if test x$theora_prefix != x ; then
     theora_args="$theora_args --prefix=$theora_prefix"
     THEORA_CFLAGS="-I$theora_prefix/include"
-    THEORA_LIBDIR="-L$theora_prefix/lib"
+    THEORA_LIBDIR="-L$theora_prefix/$XINE_LIBNAME"
   fi
 
   THEORA_LIBS="$THEORA_LIBDIR -ltheora -lm"
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index cda229d99..24786ecf4 100644
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -15,7 +15,7 @@ AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile an
   if test x$vorbis_prefix != x ; then
     vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
-    VORBIS_LIBDIR="-L$vorbis_prefix/lib"
+    VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME"
   fi
 
   VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
diff --git a/m4/xvid.m4 b/m4/xvid.m4
index f3a81a6c1..3eef0633f 100644
--- a/m4/xvid.m4
+++ b/m4/xvid.m4
@@ -15,7 +15,7 @@ AC_ARG_ENABLE(xvidtest, [  --disable-xvidtest       Do not try to compile and ru
   if test x$xvid_prefix != x ; then
     xvid_args="$xvid_args --prefix=$xvid_prefix"
     XVID_CFLAGS="-I$xvid_prefix/include"
-    XVID_LIBS="-L$xvid_prefix/lib"
+    XVID_LIBS="-L$xvid_prefix/$XINE_LIBNAME"
   fi
 
   XVID_LIBS="$XVID_LIBS -lxvidcore"