[Mplayer-cvslog] CVS: main AUTHORS, 1.127, 1.128 configure, 1.933, 1.934 Makefile, 1.310, 1.311

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv17189

Modified Files:
	AUTHORS configure Makefile 
Log Message:
polyaudio audio driver patch by Lennart Poettering <mzzcynlre at 0pointer.de>

Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- AUTHORS	3 Nov 2004 23:44:02 -0000	1.127
+++ AUTHORS	5 Nov 2004 14:02:40 -0000	1.128
@@ -581,6 +581,9 @@
     * quartz video output driver for Mac OS X
     * Darwin VCD/SVCD support
 
+Poettering, Lennart <mzzcynlre at 0pointer.de>
+    * Audio driver for the Polypaudio sound server
+
 Poirier, Guillaume <guillaume.poirier at ifsic.univ-rennes1.fr>
     * French documentation translation and synchronization
     * XviD documentation

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- configure	5 Nov 2004 13:16:14 -0000	1.933
+++ configure	5 Nov 2004 14:02:40 -0000	1.934
@@ -260,6 +260,7 @@
   --disable-ossaudio     disable OSS sound support [autodetect]
   --disable-arts         disable aRts sound support [autodetect]
   --disable-esd          disable esd sound support [autodetect]
+  --disable-polyp        disable Polypaudio sound support [autodetect]
   --disable-jack         disable JACK sound support [autodetect]
   --disable-nas          disable NAS sound support [autodetect]
   --disable-sgiaudio     disable SGI sound support [autodetect]
@@ -1286,6 +1287,7 @@
 _ossaudio=auto
 _arts=auto
 _esd=auto
+_polyp=auto
 _jack=auto
 _liblzo=auto
 _mad=auto
@@ -1462,6 +1464,8 @@
   --disable-arts)	_arts=no	;;
   --enable-esd)		_esd=yes	;;
   --disable-esd)	_esd=no		;;
+  --enable-polyp)	_polyp=yes	;;
+  --disable-polyp)	_polyp=no		;;
   --enable-jack)	_jack=yes	;;
   --disable-jack)	_jack=no	;;
   --enable-mad)		_mad=yes	;;
@@ -4389,6 +4393,34 @@
   _noaomodules="esd $_noaomodules"
 fi
 
+echocheck "Polyp"
+if test "$_polyp" = auto ; then
+  _polyp=no
+  if ( pkg-config --exists 'polyplib >= 0.6 polyplib-error >= 0.6 polyplib-mainloop >= 0.6' ) >> "$TMPLOG" 2>&1 ; then
+
+cat > $TMPC << EOF
+#include <polyp/polyplib.h>
+#include <polyp/mainloop.h>
+#include <polyp/polyplib-error.h>
+int main(void) { return 0; }
+EOF
+cc_check `pkg-config --libs --cflags polyplib polyplib-error polyplib-mainloop` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _polyp=yes
+
+  fi
+fi
+echores "$_polyp"
+
+if test "$_polyp" = yes ; then
+  _def_polyp='#define USE_POLYP 1'
+  _aosrc="$_aosrc ao_polyp.c"
+  _aomodules="polyp $_aomodules"
+  _ld_polyp=`pkg-config --libs polyplib polyplib-error polyplib-mainloop`
+  _inc_polyp=`pkg-config --cflags polyplib polyplib-error polyplib-mainloop`
+else
+  _def_polyp='#undef USE_POLYP'
+  _noaomodules="polyp $_noaomodules"
+fi
+
 
 echocheck "JACK"
 if test "$_jack" = auto ; then
@@ -6465,6 +6497,8 @@
 ARTS_INC = $_inc_arts
 ESD_LIB = $_ld_esd
 ESD_INC = $_inc_esd
+POLYP_LIB = $_ld_polyp
+POLYP_INC = $_inc_polyp
 JACK_LIB = $_ld_jack
 JACK_INC = $_inc_jack
 SGIAUDIO_LIB = $_ld_sgiaudio
@@ -6889,6 +6923,7 @@
 $_def_arts
 $_def_esd
 $_def_esd_latency
+$_def_polyp
 $_def_jack
 $_def_sys_asoundlib_h
 $_def_alsa_asoundlib_h

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- Makefile	28 Oct 2004 01:15:51 -0000	1.310
+++ Makefile	5 Nov 2004 14:02:40 -0000	1.311
@@ -31,7 +31,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) $(CACA_LIB)
-AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
+AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) $(POLYP_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
 COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)