[Mplayer-cvslog] CVS: main Makefile,1.239,1.240 configure,1.623,1.624

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv16813

Modified Files:
	Makefile configure 
Log Message:
XMMS Input plugin support
based on patches by Balatoni Denes <pnis at coder.hu>
changes by me: glib dependency removed, files merged, code simplified, some bugfixes


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- Makefile	15 Dec 2002 23:45:19 -0000	1.239
+++ Makefile	22 Dec 2002 21:00:46 -0000	1.240
@@ -35,7 +35,7 @@
 
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(GIF_LIB) 
 AO_LIBS = $(ARTS_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
-CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) 
+CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- configure	21 Dec 2002 22:16:48 -0000	1.623
+++ configure	22 Dec 2002 21:00:46 -0000	1.624
@@ -175,6 +175,7 @@
   --enable-faad          build with FAAD2 (MP4/AAC) support [autodetect]
   --disable-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
   --disable-mad          disable libmad (mpeg audio) support [autodetect]
+  --enable-xmms          build with XMMS inputplugin support [disabled]
   
 Video output:
   --disable-vidix        disable VIDIX stuff [enable on x86 *nix]
@@ -268,6 +269,8 @@
   --with-glib-config=PATH  path to glib*-config (e.g. /opt/bin/glib-config)
   --with-dvdnav-config=PATH  path to dvdnav-config
   --with-livelibdir=DIR    path to LIVE.COM Streaming Media libraries
+  --with-xmmsplugindir=DIR path to xmms plugins
+  --with-xmmslibdir=DIR    path to libxmms.so.1
 
 EOF
     exit 0
@@ -976,6 +979,7 @@
 _vorbis=auto
 _tremor=no
 _faad=auto
+_xmms=no
 _css=auto
 _dvdnav=yes
 _dvdread=auto
@@ -1116,6 +1120,7 @@
   --disable-tremor)	_tremor=no	;;
   --enable-faad)	_faad=yes	;;
   --disable-faad)	_faad=no	;;
+  --enable-xmms)	_xmms=yes	;;
   --enable-css)		_css=yes	;;
   --disable-css)	_css=no		;;
   --enable-dvdread)	_dvdread=yes	;;
@@ -1259,6 +1264,14 @@
     _mlib=yes
     ;;
 
+  --with-xmmslibdir=*)
+    _xmmslibdir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
+    
+  --with-xmmsplugindir=*)
+    _xmmsplugindir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
+    
   --disable-profile)
     _profile=
     ;;
@@ -4346,6 +4359,33 @@
 fi
 echores "$_sortsub"
 
+
+echocheck "XMMS inputplugin support"
+if test "$_xmms" = yes ; then
+
+  if ( xmms-config --version ) >/dev/null 2>&1 ; then
+    if test -z "$_xmmsplugindir" ; then
+      _xmmsplugindir=`xmms-config --input-plugin-dir`
+    fi
+    if test -z "$_xmmslibdir" ; then
+      _xmmslibdir=`xmms-config --exec-prefix`/lib
+    fi
+  else
+    if test -z "$_xmmsplugindir" ; then
+      _xmmsplugindir=/usr/lib/xmms/Input
+    fi
+    if test -z "$_xmmslibdir" ; then
+      _xmmslibdir=/usr/lib
+    fi
+  fi
+
+  _def_xmms='#define HAVE_XMMS 1'
+  _xmms_lib="${_xmmslibdir}/libxmms.so.1 -export-dynamic"
+else
+  _def_xmms='#undef HAVE_XMMS'
+fi
+echores "$_xmms"
+
 # --------------- GUI specific tests begin -------------------
 echocheck "GUI"
 echo "$_gui"
@@ -4695,6 +4735,8 @@
 MAD_LIB = $_ld_mad
 VORBIS_LIB = $_ld_vorbis $_ld_libdv
 FAAD_LIB = $_ld_faad
+XMMS_PLUGINS = $_xmms
+XMMS_LIB = $_xmms_lib
 
 # --- Some stuff for autoconfigure ----
 $_target_arch
@@ -5100,6 +5142,10 @@
 
 /* enables / disables subtitles sorting */
 $_def_sortsub
+
+/* XMMS input plugin support */
+$_def_xmms
+#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"
 
 /* Extension defines */
 $_def_3dnow	// only define if you have 3DNOW (AMD k6-2, AMD Athlon, iDT WinChip, etc.)