[vlc-commits] commit: Require XCB version of libpulse ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 30 19:27:04 2010 +0300| [383e30d5d0eb7c02f3ba861c3efb09d6bea221cf] | committer: Rémi Denis-Courmont 

Require XCB version of libpulse

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=383e30d5d0eb7c02f3ba861c3efb09d6bea221cf
---

 configure.ac                 |   10 +---------
 modules/audio_output/pulse.c |    7 -------
 2 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 13dcbc9..09ed073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3555,15 +3555,7 @@ fi
 dnl
 dnl  Pulseaudio module
 dnl
-AS_IF([test "${no_x}" = "yes"], [
-  AS_IF([test "${enable_pulse}" = "yes"], [
-    AC_MSG_ERROR([Xlib is required for VLC PulseAudio support
-(see http://www.pulseaudio.org/ticket/799 for further reference).])
-  ])
-], [
-  PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
-  VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
-])
+PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.22], [Pulseaudio support], [auto])
 
 dnl
 dnl  Portaudio module
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 4a23964..e800c43 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -34,10 +34,6 @@
 #include <vlc_cpu.h>
 
 #include <pulse/pulseaudio.h>
-#ifdef X_DISPLAY_MISSING
-# error Xlib required due to PulseAudio bug 799!
-#endif
-#include <vlc_xlib.h>
 
 #include <assert.h>
 
@@ -120,9 +116,6 @@ static int Open ( vlc_object_t *p_this )
     struct pa_channel_map map;
     char * p_client_name;
 
-    if( !vlc_xlib_init( p_this ) )
-        return VLC_EGENERIC;
-
     /* Allocate structures */
     p_aout->output.p_sys = p_sys = calloc( 1, sizeof( aout_sys_t ) );
     if( p_sys == NULL )