[MPlayer-cvslog] CVS: main AUTHORS, 1.151, 1.152 configure, 1.1012, 1.1013

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	AUTHORS configure 
Log Message:
New ao_jack without bio2jack dependency.
Since I rewrote ao_jack.c from scratch, the diff is unreadable, sorry.


Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- AUTHORS	2 May 2005 18:45:16 -0000	1.151
+++ AUTHORS	1 Jun 2005 09:20:45 -0000	1.152
@@ -209,6 +209,7 @@
     * various fixes all over the place
     * reworked live changing playback speed
     * made MMS over HTTP stream selection work and modified ASF header parsing
+    * reimplemented ao_jack without bio2jack dependency
 
 Dolbeau, Romain <romain at dolbeau.org>
     * random AltiVec (PowerPC multimedia extensions) stuff
@@ -671,6 +672,9 @@
     * EWMH fullscreen
     * suboption parser
 
+Strzelecki, Kamil < esack at browarek.net >
+    * first version of ao_jack, using bio2jack
+
 Svoboda, Jiri (zar) <Jiri.Svoboda at seznam.cz>
     * AQT type subtitles support
     * CRTC2 YUV support in mga_vid

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -r1.1012 -r1.1013
--- configure	1 Jun 2005 09:08:15 -0000	1.1012
+++ configure	1 Jun 2005 09:20:45 -0000	1.1013
@@ -356,7 +356,6 @@
   --with-toolamedir=DIR    path to Toolame library and include file
   --with-xmmsplugindir=DIR XMMS plugins in DIR
   --with-xmmslibdir=DIR    libxmms.so.1 in DIR
-  --with-bio2jack=DIR      libbio2jack.a in DIR
   --with-cdparanoiaincdir=DIR  cdparanoia headers in DIR (*)
   --with-cdparanoialibdir=DIR  cdparanoia libraries (libcdda_*) in DIR (*)
   --with-xvmclib=NAME      name of adapter-specific library (e.g. XvMCNVIDIA)
@@ -1809,10 +1808,6 @@
     _xmmsplugindir=`echo $ac_option | cut -d '=' -f 2`
     ;;
 
-  --with-bio2jack=*)
-    _bio2jackdir=`echo $ac_option | cut -d '=' -f 2`
-    ;;
-    
   --enable-profile)
     _profile='-p'
     ;;
@@ -4693,16 +4688,9 @@
 
 cat > $TMPC << EOF
 #include <jack/jack.h>
-int main(void) { JACK_Init(); return 0; }
+int main(void) { jack_client_new("test"); return 0; }
 EOF
-        # This test only checks the minor version number.
-    if ( ( test `bio2jack-config --version | cut -d '.' -f 2` -ge 3 ) ) >/dev/null 2>&1 ; then
-      if test -z "$_bio2jackdir" ; then
-		cc_check -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
-	else
-		cc_check -L "$_bio2jackdir" -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
-	fi
-  fi
+	cc_check `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
 fi
 fi
 
@@ -4710,11 +4698,7 @@
   _def_jack='#define USE_JACK 1'
   _aosrc="$_aosrc ao_jack.c"
   _aomodules="jack $_aomodules"
-  if test -z "$_bio2jackdir" ; then
-    _ld_jack="-lbio2jack `pkg-config --libs jack`"
-  else
-	_ld_jack="-L \"$_bio2jackdir\" -lbio2jack `pkg-config --libs jack`"
-  fi
+  _ld_jack="`pkg-config --libs jack`"
   _inc_jack=`pkg-config --cflags jack`
 else
   _noaomodules="jack $_noaomodules"