[xine-cvs] CVS: xine-lib/m4 alsa.m4,1.12,1.13 libFLAC.m4,1.1,1.2 ogg.m4,1.2,1.3 speex.m4,1.1,1.2 theora.m4,1.2,1.3 vorbis.m4,1.2,1.3 xvid.m4,1.1,1.2

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-lib/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12518/m4

Modified Files:
	alsa.m4 libFLAC.m4 ogg.m4 speex.m4 theora.m4 vorbis.m4 xvid.m4 
Log Message:
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.



Index: alsa.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/alsa.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- alsa.m4	23 Nov 2003 23:29:27 -0000	1.12
+++ alsa.m4	19 Feb 2004 02:50:25 -0000	1.13
@@ -47,12 +47,12 @@
 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$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"
 

Index: libFLAC.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/libFLAC.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libFLAC.m4	20 Jan 2003 02:30:01 -0000	1.1
+++ libFLAC.m4	19 Feb 2004 02:50:25 -0000	1.2
@@ -16,9 +16,9 @@
   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"

Index: ogg.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/ogg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogg.m4	26 Nov 2001 21:07:49 -0000	1.2
+++ ogg.m4	19 Feb 2004 02:50:25 -0000	1.3
@@ -15,7 +15,7 @@
   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"

Index: speex.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/speex.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- speex.m4	25 May 2003 13:39:13 -0000	1.1
+++ speex.m4	19 Feb 2004 02:50:25 -0000	1.2
@@ -15,7 +15,7 @@
   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"

Index: theora.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/theora.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- theora.m4	2 Jul 2003 12:43:37 -0000	1.2
+++ theora.m4	19 Feb 2004 02:50:25 -0000	1.3
@@ -16,7 +16,7 @@
   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"

Index: vorbis.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/vorbis.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis.m4	26 Nov 2001 21:07:49 -0000	1.2
+++ vorbis.m4	19 Feb 2004 02:50:25 -0000	1.3
@@ -15,7 +15,7 @@
   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"

Index: xvid.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/xvid.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xvid.m4	20 Apr 2002 18:42:35 -0000	1.1
+++ xvid.m4	19 Feb 2004 02:50:25 -0000	1.2
@@ -15,7 +15,7 @@
   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"