[Mplayer-cvslog] CVS: main ChangeLog,1.29,1.30 Makefile,1.240,1.241 configure,1.625,1.626

[Jürgen Keil CVS]

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

Modified Files:
	ChangeLog Makefile configure 
Log Message:
new EsounD audio driver (-ao esd)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	23 Dec 2002 16:04:52 -0000	1.29
+++ ChangeLog	27 Dec 2002 16:02:44 -0000	1.30
@@ -1,6 +1,8 @@
 
 mplayer (0.90)
 
+    * -ao esd: new EsounD audio driver
+	
   rc2:
     General:
     * DOCS/tech/encoding-tips.txt and tech/directfb.txt

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- Makefile	22 Dec 2002 21:00:46 -0000	1.240
+++ Makefile	27 Dec 2002 16:02:44 -0000	1.241
@@ -34,7 +34,7 @@
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
 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)
+AO_LIBS = $(ARTS_LIB) $(ESD_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) $(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)
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- configure	23 Dec 2002 00:33:05 -0000	1.625
+++ configure	27 Dec 2002 16:02:44 -0000	1.626
@@ -211,6 +211,7 @@
 Audio output:
   --disable-ossaudio     disable OSS sound support [autodetect]
   --disable-arts         disable aRts sound support [autodetect]
+  --disable-esd          disable esd sound support [autodetect]
   --disable-alsa         disable alsa sound support [autodetect]
   --disable-sunaudio     disable Sun sound support [autodetect]
   --disable-win32waveout disable windows waveout sound support [autodetect]
@@ -975,6 +976,7 @@
 _rtc=auto
 _ossaudio=auto
 _arts=auto
+_esd=auto
 _liblzo=auto
 _mad=auto
 _vorbis=auto
@@ -1112,6 +1114,8 @@
   --disable-ossaudio)	_ossaudio=no	;;
   --enable-arts)	_arts=yes	;;
   --disable-arts)	_arts=no	;;
+  --enable-esd)		_esd=yes	;;
+  --disable-esd)	_esd=no		;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
   --enable-liblzo)	_liblzo=yes	;;
@@ -3181,6 +3185,32 @@
 echores "$_arts"
 
 
+echocheck "EsounD"
+if test "$_esd" = auto ; then
+  _esd=no
+  if ( esd-config --version ) >> "$TMPLOG" 2>&1 ; then
+
+cat > $TMPC << EOF
+#include <esd.h>
+int main(void) { return 0; }
+EOF
+cc_check `esd-config --libs` `esd-config --cflags` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _esd=yes
+
+  fi
+fi
+
+if test "$_esd" = yes ; then
+  _def_esd='#define USE_ESD 1'
+  _aosrc="$_aosrc ao_esd.c"
+  _aomodules="esd $_aomodules"
+  _ld_esd=`esd-config --libs`
+  _inc_esd=`esd-config --cflags`
+else
+  _noaomodules="esd $_noaomodules"
+fi
+echores "$_esd"
+
+
 echocheck "ALSA audio"
 if test "$_alsa" != no ; then
   _alsa=no
@@ -4711,6 +4741,8 @@
 NAS_LIB = $_ld_nas
 ARTS_LIB = $_ld_arts
 ARTS_INC = $_inc_arts
+ESD_LIB = $_ld_esd
+ESD_INC = $_inc_esd
 SGIAUDIO_LIB = $_ld_sgiaudio
 
 # input/demuxer/codecs
@@ -5027,6 +5059,7 @@
 $_def_alsa5
 $_def_alsa9
 $_def_arts
+$_def_esd
 $_def_sys_asoundlib_h
 $_def_alsa_asoundlib_h
 $_def_sunaudio