Bug#471069: [patch] pulseaudio support
Sam Hocevar
sam at zoy.org
Sat Mar 15 17:20:52 UTC 2008
Package: vlc
Version: 0.8.6.e-1
Severity: wishlist
Tags: patch
Attached is a patch by Aurélien Jarno for pulseaudio support
(backported from VLC git tree).
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24.3 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages vlc depends on:
ii libaa1 1.4p5-35 ascii art library
ii libatk1.0-0 1.22.0-1 The ATK accessibility toolkit
ii libc6 2.7-9 GNU C Library: Shared libraries
ii libcaca0 0.99.beta13b-4 colour ASCII art library
ii libcairo2 1.4.14-1 The Cairo 2D vector graphics libra
ii libcdio7 0.78.2+dfsg1-2 library to read and control CD-ROM
ii libcucul0 0.99.beta13b-4 low-level Unicode character drawin
ii libdbus-1-3 1.1.20-1 simple interprocess messaging syst
ii libdbus-glib-1-2 0.74-1 simple interprocess messaging syst
ii libfreetype6 2.3.5-1+b1 FreeType 2 font engine, shared lib
ii libfribidi0 0.10.9-1 Free Implementation of the Unicode
ii libgcc1 1:4.3.0-1 GCC support library
ii libgl1-mesa-glx [libgl 7.0.3~rc2-1 A free implementation of the OpenG
ii libglib2.0-0 2.16.1-1 The GLib library of C routines
ii libglu1-mesa [libglu1] 7.0.3~rc2-1 The OpenGL utility library (GLU)
ii libgtk2.0-0 2.12.9-2 The GTK+ graphical user interface
ii libice6 2:1.0.4-1 X11 Inter-Client Exchange library
ii libiso9660-5 0.78.2+dfsg1-2 library to work with ISO9660 files
ii libjpeg62 6b-14 The Independent JPEG Group's JPEG
ii libnotify1 [libnotify1 0.4.4-3 sends desktop notifications to a n
ii libpango1.0-0 1.20.0-1 Layout and rendering of internatio
ii libpng12-0 1.2.15~beta5-3 PNG library - runtime
ii libsdl-image1.2 1.2.6-3 image loading library for Simple D
ii libsdl1.2debian 1.2.13-2 Simple DirectMedia Layer
ii libsm6 2:1.0.3-1+b1 X11 Session Management library
ii libstdc++6 4.3.0-1 The GNU Standard C++ Library v3
ii libtar 1.2.11-4 C library for manipulating tar arc
ii libtiff4 3.8.2-7 Tag Image File Format (TIFF) libra
ii libvcdinfo0 0.7.23-4 library to extract information fro
ii libvlc0 0.8.6.e-1 multimedia player and streamer lib
ii libwxbase2.6-0 2.6.3.2.2-2 wxBase library (runtime) - non-GUI
ii libwxgtk2.6-0 2.6.3.2.2-2 wxWidgets Cross-platform C++ GUI t
ii libx11-6 2:1.0.3-7 X11 client-side library
ii libxext6 2:1.0.4-1 X11 miscellaneous extension librar
ii libxinerama1 2:1.0.3-1 X11 Xinerama extension library
ii libxosd2 2.2.14-1.5 X On-Screen Display library - runt
ii libxv1 1:1.0.3-1 X11 Video extension library
ii ttf-dejavu-core 2.24-1 Vera font family derivate with add
ii vlc-nox 0.8.6.e-1 multimedia player and streamer (wi
ii zlib1g 1:1.2.3.3.dfsg-11 compression library - runtime
vlc recommends no packages.
-- no debconf information
-------------- next part --------------
diff -u vlc-0.8.6.e/debian/changelog vlc-0.8.6.e/debian/changelog
--- vlc-0.8.6.e/debian/changelog
+++ vlc-0.8.6.e/debian/changelog
@@ -1,3 +1,9 @@
+vlc (0.8.6.e-1+pulseaudio) UNRELEASED; urgency=low
+
+ * Backport pulseaudio support from trunk.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 15 Mar 2008 15:08:33 +0100
+
vlc (0.8.6.e-1) unstable; urgency=high
[ Christophe Mutricy ]
diff -u vlc-0.8.6.e/debian/patches/series vlc-0.8.6.e/debian/patches/series
--- vlc-0.8.6.e/debian/patches/series
+++ vlc-0.8.6.e/debian/patches/series
@@ -1,4 +1,5 @@
001_am_maintainer_mode.diff
+010_pulseaudio.diff
050_bootstrap.diff
101_certificates_paths.diff
102_dejavu_font.diff
diff -u vlc-0.8.6.e/debian/patches/050_bootstrap.diff vlc-0.8.6.e/debian/patches/050_bootstrap.diff
--- vlc-0.8.6.e/debian/patches/050_bootstrap.diff
+++ vlc-0.8.6.e/debian/patches/050_bootstrap.diff
@@ -1,8 +1,103 @@
-Index: vlc-0.8.6.a.debian/configure
-===================================================================
---- vlc-0.8.6.a.debian.orig/configure 2007-03-17 00:16:23.000000000 +0100
-+++ vlc-0.8.6.a.debian/configure 2007-03-17 00:17:21.000000000 +0100
-@@ -2952,10 +2952,6 @@
+diff -Nurd vlc-0.8.6.e.orig/activex/Makefile.in vlc-0.8.6.e/activex/Makefile.in
+--- vlc-0.8.6.e.orig/activex/Makefile.in 2008-02-24 20:07:10.000000000 +0100
++++ vlc-0.8.6.e/activex/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -310,6 +310,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/bindings/java/Makefile.in vlc-0.8.6.e/bindings/java/Makefile.in
+--- vlc-0.8.6.e.orig/bindings/java/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/bindings/java/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -248,6 +248,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/bindings/java/src/Makefile.in vlc-0.8.6.e/bindings/java/src/Makefile.in
+--- vlc-0.8.6.e.orig/bindings/java/src/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/bindings/java/src/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -234,6 +234,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/bindings/Makefile.in vlc-0.8.6.e/bindings/Makefile.in
+--- vlc-0.8.6.e.orig/bindings/Makefile.in 2008-02-24 20:07:10.000000000 +0100
++++ vlc-0.8.6.e/bindings/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -243,6 +243,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/bindings/mediacontrol-python/Makefile.in vlc-0.8.6.e/bindings/mediacontrol-python/Makefile.in
+--- vlc-0.8.6.e.orig/bindings/mediacontrol-python/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/bindings/mediacontrol-python/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -238,6 +238,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/configure vlc-0.8.6.e/configure
+--- vlc-0.8.6.e.orig/configure 2008-02-24 20:07:09.000000000 +0100
++++ vlc-0.8.6.e/configure 2008-03-15 15:34:44.000000000 +0100
+@@ -968,6 +968,8 @@
+ SVG_LIBS
+ CACA_CONFIG
+ ESD_CONFIG
++PULSE_CFLAGS
++PULSE_LIBS
+ ARTS_CONFIG
+ GTK2_CFLAGS
+ GTK2_LIBS
+@@ -1081,6 +1083,8 @@
+ DIRAC_LIBS
+ SVG_CFLAGS
+ SVG_LIBS
++PULSE_CFLAGS
++PULSE_LIBS
+ GTK2_CFLAGS
+ GTK2_LIBS
+ DAAP_CFLAGS
+@@ -1784,6 +1788,7 @@
+ --enable-wingdi Win32 GDI module (default enabled on Win32)
+ --enable-oss Linux OSS /dev/dsp support (enabled on Linux)
+ --enable-esd Esound library support (default disabled)
++ --enable-pulse Pulseaudio support (default enabled)
+ --enable-portaudio Portaudio library support (default disabled)
+ --enable-arts aRts sound server (default disabled)
+ --enable-alsa ALSA sound support for Linux (default enabled)
+@@ -1959,6 +1964,9 @@
+ DIRAC_LIBS linker flags for DIRAC, overriding pkg-config
+ SVG_CFLAGS C compiler flags for SVG, overriding pkg-config
+ SVG_LIBS linker flags for SVG, overriding pkg-config
++ PULSE_CFLAGS
++ C compiler flags for PULSE, overriding pkg-config
++ PULSE_LIBS linker flags for PULSE, overriding pkg-config
+ GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
+ GTK2_LIBS linker flags for GTK2, overriding pkg-config
+ DAAP_CFLAGS C compiler flags for DAAP, overriding pkg-config
+@@ -3022,11 +3030,6 @@
@@ -13,3 +108,1651 @@
-
+-
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+@@ -6576,7 +6579,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6579 "configure"' > conftest.$ac_ext
++ echo '#line 6582 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9215,11 +9218,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9218: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9221: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9222: \$? = $ac_status" >&5
++ echo "$as_me:9225: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9505,11 +9508,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9508: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9511: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9512: \$? = $ac_status" >&5
++ echo "$as_me:9515: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9609,11 +9612,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9616: \$? = $ac_status" >&5
++ echo "$as_me:9619: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11986,7 +11989,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11989 "configure"
++#line 11992 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12086,7 +12089,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12089 "configure"
++#line 12092 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14487,11 +14490,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14490: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14493: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14494: \$? = $ac_status" >&5
++ echo "$as_me:14497: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14591,11 +14594,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14594: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14597: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14598: \$? = $ac_status" >&5
++ echo "$as_me:14601: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16189,11 +16192,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16192: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16195: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16196: \$? = $ac_status" >&5
++ echo "$as_me:16199: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16293,11 +16296,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16296: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16299: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16300: \$? = $ac_status" >&5
++ echo "$as_me:16303: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18513,11 +18516,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18516: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18519: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18520: \$? = $ac_status" >&5
++ echo "$as_me:18523: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18803,11 +18806,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18806: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18809: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18810: \$? = $ac_status" >&5
++ echo "$as_me:18813: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18907,11 +18910,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18910: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18913: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18914: \$? = $ac_status" >&5
++ echo "$as_me:18917: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -57497,6 +57500,102 @@
+ fi
+
+
++# Check whether --enable-pulse was given.
++if test "${enable_pulse+set}" = set; then
++ enableval=$enable_pulse;
++fi
++
++ if test "${enable_pulse}" != "no"
++ then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for PULSE" >&5
++echo $ECHO_N "checking for PULSE... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_CFLAGS"; then
++ pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.8\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.8") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.8" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$PULSE_LIBS"; then
++ pkg_cv_PULSE_LIBS="$PULSE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.8\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.8") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.8" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse >= 0.9.8"`
++ else
++ PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse >= 0.9.8"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$PULSE_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ { echo "$as_me:$LINENO: WARNING: pulsaudio library not found" >&5
++echo "$as_me: WARNING: pulsaudio library not found" >&2;}
++elif test $pkg_failed = untried; then
++ { echo "$as_me:$LINENO: WARNING: pulsaudio library not found" >&5
++echo "$as_me: WARNING: pulsaudio library not found" >&2;}
++else
++ PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
++ PULSE_LIBS=$pkg_cv_PULSE_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++ PLUGINS="${PLUGINS} pulse"
++
++
++ for element in pulse; do
++ eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} ${PULSE_CFLAGS}"'"'
++ am_modules_with_cflags="${am_modules_with_cflags} ${element}"
++ done
++
++
++ for element in pulse; do
++ eval "LDFLAGS_${element}="'"'"${PULSE_LIBS} "'$'"{LDFLAGS_${element}} "'"'
++ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
++ done
++:
++fi
++ fi
++
+ # Check whether --enable-portaudio was given.
+ if test "${enable_portaudio+set}" = set; then
+ enableval=$enable_portaudio; if test "${enable_portaudio}" = "yes"
+@@ -64604,7 +64703,7 @@
+ JAVA_TEST=Test.java
+ CLASS_TEST=Test.class
+ cat << \EOF > $JAVA_TEST
+-/* #line 64607 "configure" */
++/* #line 64706 "configure" */
+ public class Test {
+ }
+ EOF
+@@ -64780,7 +64879,7 @@
+ if uudecode$EXEEXT Test.uue; then
+ ac_cv_prog_uudecode_base64=yes
+ else
+- echo "configure: 64783: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
++ echo "configure: 64882: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+ echo "configure: failed file was:" >&5
+ cat Test.uue >&5
+ ac_cv_prog_uudecode_base64=no
+@@ -64902,7 +65001,7 @@
+ JAVA_TEST=Test.java
+ CLASS_TEST=Test.class
+ cat << \EOF > $JAVA_TEST
+-/* #line 64905 "configure" */
++/* #line 65004 "configure" */
+ public class Test {
+ }
+ EOF
+@@ -64939,7 +65038,7 @@
+ CLASS_TEST=Test.class
+ TEST=Test
+ cat << \EOF > $JAVA_TEST
+-/* [#]line 64942 "configure" */
++/* [#]line 65041 "configure" */
+ public class Test {
+ public static void main (String args[]) {
+ System.exit (0);
+@@ -65578,6 +65677,7 @@
+ portaudio) list="\${list} audio_output/libportaudio" ;;
+ auhal) list="\${list} audio_output/libauhal" ;;
+ jack) list="\${list} audio_output/libjack" ;;
++ pulse) list="\${list} audio_output/libpulse" ;;
+ a52) list="\${list} codec/liba52" ;;
+ cinepak) list="\${list} codec/libcinepak" ;;
+ dts) list="\${list} codec/libdts" ;;
+@@ -66958,6 +67058,8 @@
+ SVG_LIBS!$SVG_LIBS$ac_delim
+ CACA_CONFIG!$CACA_CONFIG$ac_delim
+ ESD_CONFIG!$ESD_CONFIG$ac_delim
++PULSE_CFLAGS!$PULSE_CFLAGS$ac_delim
++PULSE_LIBS!$PULSE_LIBS$ac_delim
+ ARTS_CONFIG!$ARTS_CONFIG$ac_delim
+ GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim
+ GTK2_LIBS!$GTK2_LIBS$ac_delim
+@@ -67029,7 +67131,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Nurd vlc-0.8.6.e.orig/doc/Makefile.in vlc-0.8.6.e/doc/Makefile.in
+--- vlc-0.8.6.e.orig/doc/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/doc/Makefile.in 2008-03-15 15:34:45.000000000 +0100
+@@ -244,6 +244,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/ipkg/Makefile.in vlc-0.8.6.e/ipkg/Makefile.in
+--- vlc-0.8.6.e.orig/ipkg/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/ipkg/Makefile.in 2008-03-15 15:34:46.000000000 +0100
+@@ -234,6 +234,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/loader/Makefile.in vlc-0.8.6.e/loader/Makefile.in
+--- vlc-0.8.6.e.orig/loader/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/loader/Makefile.in 2008-03-15 15:34:46.000000000 +0100
+@@ -275,6 +275,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/m4/Makefile.in vlc-0.8.6.e/m4/Makefile.in
+--- vlc-0.8.6.e.orig/m4/Makefile.in 2008-02-24 20:07:11.000000000 +0100
++++ vlc-0.8.6.e/m4/Makefile.in 2008-03-15 15:34:46.000000000 +0100
+@@ -234,6 +234,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/m4/private.m4 vlc-0.8.6.e/m4/private.m4
+--- vlc-0.8.6.e.orig/m4/private.m4 2008-02-24 20:06:44.000000000 +0100
++++ vlc-0.8.6.e/m4/private.m4 2008-03-15 15:34:28.000000000 +0100
+@@ -90,6 +90,7 @@
+ portaudio) list="\${list} audio_output/libportaudio" ;;
+ auhal) list="\${list} audio_output/libauhal" ;;
+ jack) list="\${list} audio_output/libjack" ;;
++ pulse) list="\${list} audio_output/libpulse" ;;
+ a52) list="\${list} codec/liba52" ;;
+ cinepak) list="\${list} codec/libcinepak" ;;
+ dts) list="\${list} codec/libdts" ;;
+diff -Nurd vlc-0.8.6.e.orig/Makefile.in vlc-0.8.6.e/Makefile.in
+--- vlc-0.8.6.e.orig/Makefile.in 2008-02-24 20:07:51.000000000 +0100
++++ vlc-0.8.6.e/Makefile.in 2008-03-15 15:35:14.000000000 +0100
+@@ -327,6 +327,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/cdda/Makefile.in vlc-0.8.6.e/modules/access/cdda/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/cdda/Makefile.in 2008-02-24 20:07:13.000000000 +0100
++++ vlc-0.8.6.e/modules/access/cdda/Makefile.in 2008-03-15 15:34:47.000000000 +0100
+@@ -300,6 +300,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/dshow/Makefile.in vlc-0.8.6.e/modules/access/dshow/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/dshow/Makefile.in 2008-02-24 20:07:13.000000000 +0100
++++ vlc-0.8.6.e/modules/access/dshow/Makefile.in 2008-03-15 15:34:47.000000000 +0100
+@@ -303,6 +303,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/dvb/Makefile.in vlc-0.8.6.e/modules/access/dvb/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/dvb/Makefile.in 2008-02-24 20:07:14.000000000 +0100
++++ vlc-0.8.6.e/modules/access/dvb/Makefile.in 2008-03-15 15:34:47.000000000 +0100
+@@ -300,6 +300,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/Makefile.in vlc-0.8.6.e/modules/access/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/Makefile.in 2008-02-24 20:07:13.000000000 +0100
++++ vlc-0.8.6.e/modules/access/Makefile.in 2008-03-15 15:34:47.000000000 +0100
+@@ -653,6 +653,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/mms/Makefile.in vlc-0.8.6.e/modules/access/mms/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/mms/Makefile.in 2008-02-24 20:07:14.000000000 +0100
++++ vlc-0.8.6.e/modules/access/mms/Makefile.in 2008-03-15 15:34:47.000000000 +0100
+@@ -311,6 +311,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/rtsp/Makefile.in vlc-0.8.6.e/modules/access/rtsp/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/rtsp/Makefile.in 2008-02-24 20:07:14.000000000 +0100
++++ vlc-0.8.6.e/modules/access/rtsp/Makefile.in 2008-03-15 15:34:48.000000000 +0100
+@@ -319,6 +319,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/screen/Makefile.in vlc-0.8.6.e/modules/access/screen/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/screen/Makefile.in 2008-02-24 20:07:15.000000000 +0100
++++ vlc-0.8.6.e/modules/access/screen/Makefile.in 2008-03-15 15:34:48.000000000 +0100
+@@ -331,6 +331,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/v4l/Makefile.in vlc-0.8.6.e/modules/access/v4l/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/v4l/Makefile.in 2008-02-24 20:07:15.000000000 +0100
++++ vlc-0.8.6.e/modules/access/v4l/Makefile.in 2008-03-15 15:34:48.000000000 +0100
+@@ -290,6 +290,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/vcd/Makefile.in vlc-0.8.6.e/modules/access/vcd/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/vcd/Makefile.in 2008-02-24 20:07:15.000000000 +0100
++++ vlc-0.8.6.e/modules/access/vcd/Makefile.in 2008-03-15 15:34:48.000000000 +0100
+@@ -295,6 +295,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access/vcdx/Makefile.in vlc-0.8.6.e/modules/access/vcdx/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access/vcdx/Makefile.in 2008-02-24 20:07:16.000000000 +0100
++++ vlc-0.8.6.e/modules/access/vcdx/Makefile.in 2008-03-15 15:34:49.000000000 +0100
+@@ -301,6 +301,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access_filter/Makefile.in vlc-0.8.6.e/modules/access_filter/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access_filter/Makefile.in 2008-02-24 20:07:16.000000000 +0100
++++ vlc-0.8.6.e/modules/access_filter/Makefile.in 2008-03-15 15:34:49.000000000 +0100
+@@ -361,6 +361,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/access_output/Makefile.in vlc-0.8.6.e/modules/access_output/Makefile.in
+--- vlc-0.8.6.e.orig/modules/access_output/Makefile.in 2008-02-24 20:07:17.000000000 +0100
++++ vlc-0.8.6.e/modules/access_output/Makefile.in 2008-03-15 15:34:49.000000000 +0100
+@@ -421,6 +421,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_filter/channel_mixer/Makefile.in vlc-0.8.6.e/modules/audio_filter/channel_mixer/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_filter/channel_mixer/Makefile.in 2008-02-24 20:07:17.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_filter/channel_mixer/Makefile.in 2008-03-15 15:34:50.000000000 +0100
+@@ -393,6 +393,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_filter/converter/Makefile.in vlc-0.8.6.e/modules/audio_filter/converter/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_filter/converter/Makefile.in 2008-02-24 20:07:18.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_filter/converter/Makefile.in 2008-03-15 15:34:51.000000000 +0100
+@@ -745,6 +745,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_filter/Makefile.in vlc-0.8.6.e/modules/audio_filter/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_filter/Makefile.in 2008-02-24 20:07:17.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_filter/Makefile.in 2008-03-15 15:34:50.000000000 +0100
+@@ -370,6 +370,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_filter/resampler/Makefile.in vlc-0.8.6.e/modules/audio_filter/resampler/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_filter/resampler/Makefile.in 2008-02-24 20:07:19.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_filter/resampler/Makefile.in 2008-03-15 15:34:51.000000000 +0100
+@@ -387,6 +387,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_mixer/Makefile.in vlc-0.8.6.e/modules/audio_mixer/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_mixer/Makefile.in 2008-02-24 20:07:19.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_mixer/Makefile.in 2008-03-15 15:34:51.000000000 +0100
+@@ -353,6 +353,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_output/Makefile.am vlc-0.8.6.e/modules/audio_output/Makefile.am
+--- vlc-0.8.6.e.orig/modules/audio_output/Makefile.am 2008-02-24 20:06:43.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_output/Makefile.am 2008-03-15 15:34:24.000000000 +0100
+@@ -3,7 +3,7 @@
+ # DO NOT EDIT - edit Modules.am or $(top_srcdir)/bootstrap instead
+
+ basedir = audio_output
+-mods = alsa arts aout_directx esd aout_file oss aout_sdl waveout hd1000a portaudio auhal jack
++mods = alsa arts aout_directx esd aout_file oss aout_sdl waveout hd1000a portaudio auhal jack pulse
+
+ NULL =
+ libvlc_LTLIBRARIES =
+@@ -16,8 +16,8 @@
+
+ libvlcdir = $(libdir)/vlc/$(basedir)
+
+-EXTRA_LIBRARIES = libalsa_plugin.a libalsa.a libarts_plugin.a libarts.a libaout_directx_plugin.a libaout_directx.a libesd_plugin.a libesd.a libaout_file_plugin.a libaout_file.a liboss_plugin.a liboss.a libaout_sdl_plugin.a libaout_sdl.a libwaveout_plugin.a libwaveout.a libhd1000a_plugin.a libhd1000a.a libportaudio_plugin.a libportaudio.a libauhal_plugin.a libauhal.a libjack_plugin.a libjack.a
+-EXTRA_LTLIBRARIES = libalsa_plugin.la libalsa_builtin.la libarts_plugin.la libarts_builtin.la libaout_directx_plugin.la libaout_directx_builtin.la libesd_plugin.la libesd_builtin.la libaout_file_plugin.la libaout_file_builtin.la liboss_plugin.la liboss_builtin.la libaout_sdl_plugin.la libaout_sdl_builtin.la libwaveout_plugin.la libwaveout_builtin.la libhd1000a_plugin.la libhd1000a_builtin.la libportaudio_plugin.la libportaudio_builtin.la libauhal_plugin.la libauhal_builtin.la libjack_plugin.la libjack_builtin.la
++EXTRA_LIBRARIES = libalsa_plugin.a libalsa.a libarts_plugin.a libarts.a libaout_directx_plugin.a libaout_directx.a libesd_plugin.a libesd.a libaout_file_plugin.a libaout_file.a liboss_plugin.a liboss.a libaout_sdl_plugin.a libaout_sdl.a libwaveout_plugin.a libwaveout.a libhd1000a_plugin.a libhd1000a.a libportaudio_plugin.a libportaudio.a libauhal_plugin.a libauhal.a libjack_plugin.a libjack.a libpulse_plugin.a libpulse.a
++EXTRA_LTLIBRARIES = libalsa_plugin.la libalsa_builtin.la libarts_plugin.la libarts_builtin.la libaout_directx_plugin.la libaout_directx_builtin.la libesd_plugin.la libesd_builtin.la libaout_file_plugin.la libaout_file_builtin.la liboss_plugin.la liboss_builtin.la libaout_sdl_plugin.la libaout_sdl_builtin.la libwaveout_plugin.la libwaveout_builtin.la libhd1000a_plugin.la libhd1000a_builtin.la libportaudio_plugin.la libportaudio_builtin.la libauhal_plugin.la libauhal_builtin.la libjack_plugin.la libjack_builtin.la libpulse_plugin.la libpulse_builtin.la
+
+ include Modules.am
+
+@@ -364,3 +364,26 @@
+ libjack_builtin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin jack`
+ libjack_builtin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin jack`
+
++# The pulse plugin
++
++libpulse_plugin_a_SOURCES = $(SOURCES_pulse)
++libpulse_plugin_la_SOURCES = $(SOURCES_pulse)
++libpulse_plugin_a_CFLAGS = `$(VLC_CONFIG) --cflags plugin pulse`
++libpulse_plugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin pulse`
++libpulse_plugin_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin pulse`
++libpulse_plugin_la_CFLAGS = `$(VLC_CONFIG) --cflags plugin pulse`
++libpulse_plugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin pulse`
++libpulse_plugin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin pulse`
++libpulse_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plugin pulse` \
++ -rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
++libpulse_plugin_la_LIBADD = $(LTLIBVLC)
++
++libpulse_a_SOURCES = $(SOURCES_pulse)
++libpulse_builtin_la_SOURCES = $(SOURCES_pulse)
++libpulse_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic pulse`
++libpulse_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin pic pulse`
++libpulse_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin pic pulse`
++libpulse_builtin_la_CFLAGS = `$(VLC_CONFIG) --cflags builtin pulse`
++libpulse_builtin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin pulse`
++libpulse_builtin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin pulse`
++
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_output/Makefile.in vlc-0.8.6.e/modules/audio_output/Makefile.in
+--- vlc-0.8.6.e.orig/modules/audio_output/Makefile.in 2008-02-24 20:07:20.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_output/Makefile.in 2008-03-15 15:34:52.000000000 +0100
+@@ -175,15 +175,25 @@
+ am__objects_22 = libportaudio_plugin_a-portaudio.$(OBJEXT)
+ am_libportaudio_plugin_a_OBJECTS = $(am__objects_22)
+ libportaudio_plugin_a_OBJECTS = $(am_libportaudio_plugin_a_OBJECTS)
++libpulse_a_AR = $(AR) $(ARFLAGS)
++libpulse_a_LIBADD =
++am__objects_23 = libpulse_a-pulse.$(OBJEXT)
++am_libpulse_a_OBJECTS = $(am__objects_23)
++libpulse_a_OBJECTS = $(am_libpulse_a_OBJECTS)
++libpulse_plugin_a_AR = $(AR) $(ARFLAGS)
++libpulse_plugin_a_LIBADD =
++am__objects_24 = libpulse_plugin_a-pulse.$(OBJEXT)
++am_libpulse_plugin_a_OBJECTS = $(am__objects_24)
++libpulse_plugin_a_OBJECTS = $(am_libpulse_plugin_a_OBJECTS)
+ libwaveout_a_AR = $(AR) $(ARFLAGS)
+ libwaveout_a_LIBADD =
+-am__objects_23 = libwaveout_a-waveout.$(OBJEXT)
+-am_libwaveout_a_OBJECTS = $(am__objects_23)
++am__objects_25 = libwaveout_a-waveout.$(OBJEXT)
++am_libwaveout_a_OBJECTS = $(am__objects_25)
+ libwaveout_a_OBJECTS = $(am_libwaveout_a_OBJECTS)
+ libwaveout_plugin_a_AR = $(AR) $(ARFLAGS)
+ libwaveout_plugin_a_LIBADD =
+-am__objects_24 = libwaveout_plugin_a-waveout.$(OBJEXT)
+-am_libwaveout_plugin_a_OBJECTS = $(am__objects_24)
++am__objects_26 = libwaveout_plugin_a-waveout.$(OBJEXT)
++am_libwaveout_plugin_a_OBJECTS = $(am__objects_26)
+ libwaveout_plugin_a_OBJECTS = $(am_libwaveout_plugin_a_OBJECTS)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -195,105 +205,113 @@
+ libvlcLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(libvlc_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ libalsa_builtin_la_LIBADD =
+-am__objects_25 = libalsa_builtin_la-alsa.lo
+-am_libalsa_builtin_la_OBJECTS = $(am__objects_25)
++am__objects_27 = libalsa_builtin_la-alsa.lo
++am_libalsa_builtin_la_OBJECTS = $(am__objects_27)
+ libalsa_builtin_la_OBJECTS = $(am_libalsa_builtin_la_OBJECTS)
+ am__DEPENDENCIES_1 = $(top_builddir)/src/libvlc.la
+ libalsa_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_26 = libalsa_plugin_la-alsa.lo
+-am_libalsa_plugin_la_OBJECTS = $(am__objects_26)
++am__objects_28 = libalsa_plugin_la-alsa.lo
++am_libalsa_plugin_la_OBJECTS = $(am__objects_28)
+ libalsa_plugin_la_OBJECTS = $(am_libalsa_plugin_la_OBJECTS)
+ libaout_directx_builtin_la_LIBADD =
+-am__objects_27 = libaout_directx_builtin_la-directx.lo
+-am_libaout_directx_builtin_la_OBJECTS = $(am__objects_27)
++am__objects_29 = libaout_directx_builtin_la-directx.lo
++am_libaout_directx_builtin_la_OBJECTS = $(am__objects_29)
+ libaout_directx_builtin_la_OBJECTS = \
+ $(am_libaout_directx_builtin_la_OBJECTS)
+ libaout_directx_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_28 = libaout_directx_plugin_la-directx.lo
+-am_libaout_directx_plugin_la_OBJECTS = $(am__objects_28)
++am__objects_30 = libaout_directx_plugin_la-directx.lo
++am_libaout_directx_plugin_la_OBJECTS = $(am__objects_30)
+ libaout_directx_plugin_la_OBJECTS = \
+ $(am_libaout_directx_plugin_la_OBJECTS)
+ libaout_file_builtin_la_LIBADD =
+-am__objects_29 = libaout_file_builtin_la-file.lo
+-am_libaout_file_builtin_la_OBJECTS = $(am__objects_29)
++am__objects_31 = libaout_file_builtin_la-file.lo
++am_libaout_file_builtin_la_OBJECTS = $(am__objects_31)
+ libaout_file_builtin_la_OBJECTS = \
+ $(am_libaout_file_builtin_la_OBJECTS)
+ libaout_file_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_30 = libaout_file_plugin_la-file.lo
+-am_libaout_file_plugin_la_OBJECTS = $(am__objects_30)
++am__objects_32 = libaout_file_plugin_la-file.lo
++am_libaout_file_plugin_la_OBJECTS = $(am__objects_32)
+ libaout_file_plugin_la_OBJECTS = $(am_libaout_file_plugin_la_OBJECTS)
+ libaout_sdl_builtin_la_LIBADD =
+-am__objects_31 = libaout_sdl_builtin_la-sdl.lo
+-am_libaout_sdl_builtin_la_OBJECTS = $(am__objects_31)
++am__objects_33 = libaout_sdl_builtin_la-sdl.lo
++am_libaout_sdl_builtin_la_OBJECTS = $(am__objects_33)
+ libaout_sdl_builtin_la_OBJECTS = $(am_libaout_sdl_builtin_la_OBJECTS)
+ libaout_sdl_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_32 = libaout_sdl_plugin_la-sdl.lo
+-am_libaout_sdl_plugin_la_OBJECTS = $(am__objects_32)
++am__objects_34 = libaout_sdl_plugin_la-sdl.lo
++am_libaout_sdl_plugin_la_OBJECTS = $(am__objects_34)
+ libaout_sdl_plugin_la_OBJECTS = $(am_libaout_sdl_plugin_la_OBJECTS)
+ libarts_builtin_la_LIBADD =
+-am__objects_33 = libarts_builtin_la-arts.lo
+-am_libarts_builtin_la_OBJECTS = $(am__objects_33)
++am__objects_35 = libarts_builtin_la-arts.lo
++am_libarts_builtin_la_OBJECTS = $(am__objects_35)
+ libarts_builtin_la_OBJECTS = $(am_libarts_builtin_la_OBJECTS)
+ libarts_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_34 = libarts_plugin_la-arts.lo
+-am_libarts_plugin_la_OBJECTS = $(am__objects_34)
++am__objects_36 = libarts_plugin_la-arts.lo
++am_libarts_plugin_la_OBJECTS = $(am__objects_36)
+ libarts_plugin_la_OBJECTS = $(am_libarts_plugin_la_OBJECTS)
+ libauhal_builtin_la_LIBADD =
+-am__objects_35 = libauhal_builtin_la-auhal.lo
+-am_libauhal_builtin_la_OBJECTS = $(am__objects_35)
++am__objects_37 = libauhal_builtin_la-auhal.lo
++am_libauhal_builtin_la_OBJECTS = $(am__objects_37)
+ libauhal_builtin_la_OBJECTS = $(am_libauhal_builtin_la_OBJECTS)
+ libauhal_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_36 = libauhal_plugin_la-auhal.lo
+-am_libauhal_plugin_la_OBJECTS = $(am__objects_36)
++am__objects_38 = libauhal_plugin_la-auhal.lo
++am_libauhal_plugin_la_OBJECTS = $(am__objects_38)
+ libauhal_plugin_la_OBJECTS = $(am_libauhal_plugin_la_OBJECTS)
+ libesd_builtin_la_LIBADD =
+-am__objects_37 = libesd_builtin_la-esd.lo
+-am_libesd_builtin_la_OBJECTS = $(am__objects_37)
++am__objects_39 = libesd_builtin_la-esd.lo
++am_libesd_builtin_la_OBJECTS = $(am__objects_39)
+ libesd_builtin_la_OBJECTS = $(am_libesd_builtin_la_OBJECTS)
+ libesd_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_38 = libesd_plugin_la-esd.lo
+-am_libesd_plugin_la_OBJECTS = $(am__objects_38)
++am__objects_40 = libesd_plugin_la-esd.lo
++am_libesd_plugin_la_OBJECTS = $(am__objects_40)
+ libesd_plugin_la_OBJECTS = $(am_libesd_plugin_la_OBJECTS)
+ libhd1000a_builtin_la_LIBADD =
+-am__objects_39 = libhd1000a_builtin_la-hd1000a.lo
+-am_libhd1000a_builtin_la_OBJECTS = $(am__objects_39)
++am__objects_41 = libhd1000a_builtin_la-hd1000a.lo
++am_libhd1000a_builtin_la_OBJECTS = $(am__objects_41)
+ libhd1000a_builtin_la_OBJECTS = $(am_libhd1000a_builtin_la_OBJECTS)
+ libhd1000a_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_40 = libhd1000a_plugin_la-hd1000a.lo
+-am_libhd1000a_plugin_la_OBJECTS = $(am__objects_40)
++am__objects_42 = libhd1000a_plugin_la-hd1000a.lo
++am_libhd1000a_plugin_la_OBJECTS = $(am__objects_42)
+ libhd1000a_plugin_la_OBJECTS = $(am_libhd1000a_plugin_la_OBJECTS)
+ libjack_builtin_la_LIBADD =
+-am__objects_41 = libjack_builtin_la-jack.lo
+-am_libjack_builtin_la_OBJECTS = $(am__objects_41)
++am__objects_43 = libjack_builtin_la-jack.lo
++am_libjack_builtin_la_OBJECTS = $(am__objects_43)
+ libjack_builtin_la_OBJECTS = $(am_libjack_builtin_la_OBJECTS)
+ libjack_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_42 = libjack_plugin_la-jack.lo
+-am_libjack_plugin_la_OBJECTS = $(am__objects_42)
++am__objects_44 = libjack_plugin_la-jack.lo
++am_libjack_plugin_la_OBJECTS = $(am__objects_44)
+ libjack_plugin_la_OBJECTS = $(am_libjack_plugin_la_OBJECTS)
+ liboss_builtin_la_LIBADD =
+-am__objects_43 = liboss_builtin_la-oss.lo
+-am_liboss_builtin_la_OBJECTS = $(am__objects_43)
++am__objects_45 = liboss_builtin_la-oss.lo
++am_liboss_builtin_la_OBJECTS = $(am__objects_45)
+ liboss_builtin_la_OBJECTS = $(am_liboss_builtin_la_OBJECTS)
+ liboss_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_44 = liboss_plugin_la-oss.lo
+-am_liboss_plugin_la_OBJECTS = $(am__objects_44)
++am__objects_46 = liboss_plugin_la-oss.lo
++am_liboss_plugin_la_OBJECTS = $(am__objects_46)
+ liboss_plugin_la_OBJECTS = $(am_liboss_plugin_la_OBJECTS)
+ libportaudio_builtin_la_LIBADD =
+-am__objects_45 = libportaudio_builtin_la-portaudio.lo
+-am_libportaudio_builtin_la_OBJECTS = $(am__objects_45)
++am__objects_47 = libportaudio_builtin_la-portaudio.lo
++am_libportaudio_builtin_la_OBJECTS = $(am__objects_47)
+ libportaudio_builtin_la_OBJECTS = \
+ $(am_libportaudio_builtin_la_OBJECTS)
+ libportaudio_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_46 = libportaudio_plugin_la-portaudio.lo
+-am_libportaudio_plugin_la_OBJECTS = $(am__objects_46)
++am__objects_48 = libportaudio_plugin_la-portaudio.lo
++am_libportaudio_plugin_la_OBJECTS = $(am__objects_48)
+ libportaudio_plugin_la_OBJECTS = $(am_libportaudio_plugin_la_OBJECTS)
++libpulse_builtin_la_LIBADD =
++am__objects_49 = libpulse_builtin_la-pulse.lo
++am_libpulse_builtin_la_OBJECTS = $(am__objects_49)
++libpulse_builtin_la_OBJECTS = $(am_libpulse_builtin_la_OBJECTS)
++libpulse_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am__objects_50 = libpulse_plugin_la-pulse.lo
++am_libpulse_plugin_la_OBJECTS = $(am__objects_50)
++libpulse_plugin_la_OBJECTS = $(am_libpulse_plugin_la_OBJECTS)
+ libwaveout_builtin_la_LIBADD =
+-am__objects_47 = libwaveout_builtin_la-waveout.lo
+-am_libwaveout_builtin_la_OBJECTS = $(am__objects_47)
++am__objects_51 = libwaveout_builtin_la-waveout.lo
++am_libwaveout_builtin_la_OBJECTS = $(am__objects_51)
+ libwaveout_builtin_la_OBJECTS = $(am_libwaveout_builtin_la_OBJECTS)
+ libwaveout_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__objects_48 = libwaveout_plugin_la-waveout.lo
+-am_libwaveout_plugin_la_OBJECTS = $(am__objects_48)
++am__objects_52 = libwaveout_plugin_la-waveout.lo
++am_libwaveout_plugin_la_OBJECTS = $(am__objects_52)
+ libwaveout_plugin_la_OBJECTS = $(am_libwaveout_plugin_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
+@@ -325,7 +343,8 @@
+ $(libhd1000a_plugin_a_SOURCES) $(libjack_a_SOURCES) \
+ $(libjack_plugin_a_SOURCES) $(liboss_a_SOURCES) \
+ $(liboss_plugin_a_SOURCES) $(libportaudio_a_SOURCES) \
+- $(libportaudio_plugin_a_SOURCES) $(libwaveout_a_SOURCES) \
++ $(libportaudio_plugin_a_SOURCES) $(libpulse_a_SOURCES) \
++ $(libpulse_plugin_a_SOURCES) $(libwaveout_a_SOURCES) \
+ $(libwaveout_plugin_a_SOURCES) $(libalsa_builtin_la_SOURCES) \
+ $(libalsa_plugin_la_SOURCES) \
+ $(libaout_directx_builtin_la_SOURCES) \
+@@ -341,6 +360,7 @@
+ $(libjack_plugin_la_SOURCES) $(liboss_builtin_la_SOURCES) \
+ $(liboss_plugin_la_SOURCES) $(libportaudio_builtin_la_SOURCES) \
+ $(libportaudio_plugin_la_SOURCES) \
++ $(libpulse_builtin_la_SOURCES) $(libpulse_plugin_la_SOURCES) \
+ $(libwaveout_builtin_la_SOURCES) \
+ $(libwaveout_plugin_la_SOURCES)
+ DIST_SOURCES = $(libalsa_a_SOURCES) $(libalsa_plugin_a_SOURCES) \
+@@ -354,7 +374,8 @@
+ $(libhd1000a_plugin_a_SOURCES) $(libjack_a_SOURCES) \
+ $(libjack_plugin_a_SOURCES) $(liboss_a_SOURCES) \
+ $(liboss_plugin_a_SOURCES) $(libportaudio_a_SOURCES) \
+- $(libportaudio_plugin_a_SOURCES) $(libwaveout_a_SOURCES) \
++ $(libportaudio_plugin_a_SOURCES) $(libpulse_a_SOURCES) \
++ $(libpulse_plugin_a_SOURCES) $(libwaveout_a_SOURCES) \
+ $(libwaveout_plugin_a_SOURCES) $(libalsa_builtin_la_SOURCES) \
+ $(libalsa_plugin_la_SOURCES) \
+ $(libaout_directx_builtin_la_SOURCES) \
+@@ -370,6 +391,7 @@
+ $(libjack_plugin_la_SOURCES) $(liboss_builtin_la_SOURCES) \
+ $(liboss_plugin_la_SOURCES) $(libportaudio_builtin_la_SOURCES) \
+ $(libportaudio_plugin_la_SOURCES) \
++ $(libpulse_builtin_la_SOURCES) $(libpulse_plugin_la_SOURCES) \
+ $(libwaveout_builtin_la_SOURCES) \
+ $(libwaveout_plugin_la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -555,6 +577,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+@@ -652,7 +676,7 @@
+ target_vendor = @target_vendor@
+ uudecode = @uudecode@
+ basedir = audio_output
+-mods = alsa arts aout_directx esd aout_file oss aout_sdl waveout hd1000a portaudio auhal jack
++mods = alsa arts aout_directx esd aout_file oss aout_sdl waveout hd1000a portaudio auhal jack pulse
+ NULL =
+ libvlc_LTLIBRARIES =
+ noinst_LTLIBRARIES =
+@@ -662,8 +686,8 @@
+ SUBDIRS =
+ SUFFIXES = _plugin$(LIBEXT) _plugin.a
+ libvlcdir = $(libdir)/vlc/$(basedir)
+-EXTRA_LIBRARIES = libalsa_plugin.a libalsa.a libarts_plugin.a libarts.a libaout_directx_plugin.a libaout_directx.a libesd_plugin.a libesd.a libaout_file_plugin.a libaout_file.a liboss_plugin.a liboss.a libaout_sdl_plugin.a libaout_sdl.a libwaveout_plugin.a libwaveout.a libhd1000a_plugin.a libhd1000a.a libportaudio_plugin.a libportaudio.a libauhal_plugin.a libauhal.a libjack_plugin.a libjack.a
+-EXTRA_LTLIBRARIES = libalsa_plugin.la libalsa_builtin.la libarts_plugin.la libarts_builtin.la libaout_directx_plugin.la libaout_directx_builtin.la libesd_plugin.la libesd_builtin.la libaout_file_plugin.la libaout_file_builtin.la liboss_plugin.la liboss_builtin.la libaout_sdl_plugin.la libaout_sdl_builtin.la libwaveout_plugin.la libwaveout_builtin.la libhd1000a_plugin.la libhd1000a_builtin.la libportaudio_plugin.la libportaudio_builtin.la libauhal_plugin.la libauhal_builtin.la libjack_plugin.la libjack_builtin.la
++EXTRA_LIBRARIES = libalsa_plugin.a libalsa.a libarts_plugin.a libarts.a libaout_directx_plugin.a libaout_directx.a libesd_plugin.a libesd.a libaout_file_plugin.a libaout_file.a liboss_plugin.a liboss.a libaout_sdl_plugin.a libaout_sdl.a libwaveout_plugin.a libwaveout.a libhd1000a_plugin.a libhd1000a.a libportaudio_plugin.a libportaudio.a libauhal_plugin.a libauhal.a libjack_plugin.a libjack.a libpulse_plugin.a libpulse.a
++EXTRA_LTLIBRARIES = libalsa_plugin.la libalsa_builtin.la libarts_plugin.la libarts_builtin.la libaout_directx_plugin.la libaout_directx_builtin.la libesd_plugin.la libesd_builtin.la libaout_file_plugin.la libaout_file_builtin.la liboss_plugin.la liboss_builtin.la libaout_sdl_plugin.la libaout_sdl_builtin.la libwaveout_plugin.la libwaveout_builtin.la libhd1000a_plugin.la libhd1000a_builtin.la libportaudio_plugin.la libportaudio_builtin.la libauhal_plugin.la libauhal_builtin.la libjack_plugin.la libjack_builtin.la libpulse_plugin.la libpulse_builtin.la
+ SOURCES_alsa = alsa.c
+ SOURCES_arts = arts.c
+ SOURCES_aout_directx = directx.c
+@@ -676,6 +700,7 @@
+ SOURCES_portaudio = portaudio.c
+ SOURCES_auhal = auhal.c
+ SOURCES_jack = jack.c
++SOURCES_pulse = pulse.c
+ LTLIBVLC = $(top_builddir)/src/libvlc.la
+ @BUILD_SHARED_TRUE at LIBVLC = $(top_builddir)/src/libvlc$(LIBEXT)
+ @BUILD_SHARED_TRUE at LIBADD = $(LIBVLC)
+@@ -943,6 +968,28 @@
+ libjack_builtin_la_CFLAGS = `$(VLC_CONFIG) --cflags builtin jack`
+ libjack_builtin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin jack`
+ libjack_builtin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin jack`
++
++# The pulse plugin
++libpulse_plugin_a_SOURCES = $(SOURCES_pulse)
++libpulse_plugin_la_SOURCES = $(SOURCES_pulse)
++libpulse_plugin_a_CFLAGS = `$(VLC_CONFIG) --cflags plugin pulse`
++libpulse_plugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin pulse`
++libpulse_plugin_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin pulse`
++libpulse_plugin_la_CFLAGS = `$(VLC_CONFIG) --cflags plugin pulse`
++libpulse_plugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin pulse`
++libpulse_plugin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin pulse`
++libpulse_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plugin pulse` \
++ -rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
++
++libpulse_plugin_la_LIBADD = $(LTLIBVLC)
++libpulse_a_SOURCES = $(SOURCES_pulse)
++libpulse_builtin_la_SOURCES = $(SOURCES_pulse)
++libpulse_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic pulse`
++libpulse_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin pic pulse`
++libpulse_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin pic pulse`
++libpulse_builtin_la_CFLAGS = `$(VLC_CONFIG) --cflags builtin pulse`
++libpulse_builtin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags builtin pulse`
++libpulse_builtin_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags builtin pulse`
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+@@ -1065,6 +1112,14 @@
+ -rm -f libportaudio_plugin.a
+ $(libportaudio_plugin_a_AR) libportaudio_plugin.a $(libportaudio_plugin_a_OBJECTS) $(libportaudio_plugin_a_LIBADD)
+ $(RANLIB) libportaudio_plugin.a
++libpulse.a: $(libpulse_a_OBJECTS) $(libpulse_a_DEPENDENCIES)
++ -rm -f libpulse.a
++ $(libpulse_a_AR) libpulse.a $(libpulse_a_OBJECTS) $(libpulse_a_LIBADD)
++ $(RANLIB) libpulse.a
++libpulse_plugin.a: $(libpulse_plugin_a_OBJECTS) $(libpulse_plugin_a_DEPENDENCIES)
++ -rm -f libpulse_plugin.a
++ $(libpulse_plugin_a_AR) libpulse_plugin.a $(libpulse_plugin_a_OBJECTS) $(libpulse_plugin_a_LIBADD)
++ $(RANLIB) libpulse_plugin.a
+ libwaveout.a: $(libwaveout_a_OBJECTS) $(libwaveout_a_DEPENDENCIES)
+ -rm -f libwaveout.a
+ $(libwaveout_a_AR) libwaveout.a $(libwaveout_a_OBJECTS) $(libwaveout_a_LIBADD)
+@@ -1153,6 +1208,10 @@
+ $(LINK) $(libportaudio_builtin_la_LDFLAGS) $(libportaudio_builtin_la_OBJECTS) $(libportaudio_builtin_la_LIBADD) $(LIBS)
+ libportaudio_plugin.la: $(libportaudio_plugin_la_OBJECTS) $(libportaudio_plugin_la_DEPENDENCIES)
+ $(LINK) $(libportaudio_plugin_la_LDFLAGS) $(libportaudio_plugin_la_OBJECTS) $(libportaudio_plugin_la_LIBADD) $(LIBS)
++libpulse_builtin.la: $(libpulse_builtin_la_OBJECTS) $(libpulse_builtin_la_DEPENDENCIES)
++ $(LINK) $(libpulse_builtin_la_LDFLAGS) $(libpulse_builtin_la_OBJECTS) $(libpulse_builtin_la_LIBADD) $(LIBS)
++libpulse_plugin.la: $(libpulse_plugin_la_OBJECTS) $(libpulse_plugin_la_DEPENDENCIES)
++ $(LINK) $(libpulse_plugin_la_LDFLAGS) $(libpulse_plugin_la_OBJECTS) $(libpulse_plugin_la_LIBADD) $(LIBS)
+ libwaveout_builtin.la: $(libwaveout_builtin_la_OBJECTS) $(libwaveout_builtin_la_DEPENDENCIES)
+ $(LINK) $(libwaveout_builtin_la_LDFLAGS) $(libwaveout_builtin_la_OBJECTS) $(libwaveout_builtin_la_LIBADD) $(LIBS)
+ libwaveout_plugin.la: $(libwaveout_plugin_la_OBJECTS) $(libwaveout_plugin_la_DEPENDENCIES)
+@@ -1208,6 +1267,10 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libportaudio_builtin_la-portaudio.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libportaudio_plugin_a-portaudio.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libportaudio_plugin_la-portaudio.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpulse_a-pulse.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpulse_builtin_la-pulse.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpulse_plugin_a-pulse.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libpulse_plugin_la-pulse.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwaveout_a-waveout.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwaveout_builtin_la-waveout.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwaveout_plugin_a-waveout.Po at am__quote@
+@@ -1514,6 +1577,34 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libportaudio_plugin_a_CFLAGS) $(CFLAGS) -c -o libportaudio_plugin_a-portaudio.obj `if test -f 'portaudio.c'; then $(CYGPATH_W) 'portaudio.c'; else $(CYGPATH_W) '$(srcdir)/portaudio.c'; fi`
+
++libpulse_a-pulse.o: pulse.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_a_CFLAGS) $(CFLAGS) -MT libpulse_a-pulse.o -MD -MP -MF "$(DEPDIR)/libpulse_a-pulse.Tpo" -c -o libpulse_a-pulse.o `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_a-pulse.Tpo" "$(DEPDIR)/libpulse_a-pulse.Po"; else rm -f "$(DEPDIR)/libpulse_a-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_a-pulse.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_a_CFLAGS) $(CFLAGS) -c -o libpulse_a-pulse.o `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
++
++libpulse_a-pulse.obj: pulse.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_a_CFLAGS) $(CFLAGS) -MT libpulse_a-pulse.obj -MD -MP -MF "$(DEPDIR)/libpulse_a-pulse.Tpo" -c -o libpulse_a-pulse.obj `if test -f 'pulse.c'; then $(CYGPATH_W) 'pulse.c'; else $(CYGPATH_W) '$(srcdir)/pulse.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_a-pulse.Tpo" "$(DEPDIR)/libpulse_a-pulse.Po"; else rm -f "$(DEPDIR)/libpulse_a-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_a-pulse.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_a_CFLAGS) $(CFLAGS) -c -o libpulse_a-pulse.obj `if test -f 'pulse.c'; then $(CYGPATH_W) 'pulse.c'; else $(CYGPATH_W) '$(srcdir)/pulse.c'; fi`
++
++libpulse_plugin_a-pulse.o: pulse.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_a_CFLAGS) $(CFLAGS) -MT libpulse_plugin_a-pulse.o -MD -MP -MF "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo" -c -o libpulse_plugin_a-pulse.o `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo" "$(DEPDIR)/libpulse_plugin_a-pulse.Po"; else rm -f "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_plugin_a-pulse.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_a_CFLAGS) $(CFLAGS) -c -o libpulse_plugin_a-pulse.o `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
++
++libpulse_plugin_a-pulse.obj: pulse.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_a_CFLAGS) $(CFLAGS) -MT libpulse_plugin_a-pulse.obj -MD -MP -MF "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo" -c -o libpulse_plugin_a-pulse.obj `if test -f 'pulse.c'; then $(CYGPATH_W) 'pulse.c'; else $(CYGPATH_W) '$(srcdir)/pulse.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo" "$(DEPDIR)/libpulse_plugin_a-pulse.Po"; else rm -f "$(DEPDIR)/libpulse_plugin_a-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_plugin_a-pulse.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_a_CFLAGS) $(CFLAGS) -c -o libpulse_plugin_a-pulse.obj `if test -f 'pulse.c'; then $(CYGPATH_W) 'pulse.c'; else $(CYGPATH_W) '$(srcdir)/pulse.c'; fi`
++
+ libwaveout_a-waveout.o: waveout.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwaveout_a_CFLAGS) $(CFLAGS) -MT libwaveout_a-waveout.o -MD -MP -MF "$(DEPDIR)/libwaveout_a-waveout.Tpo" -c -o libwaveout_a-waveout.o `test -f 'waveout.c' || echo '$(srcdir)/'`waveout.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwaveout_a-waveout.Tpo" "$(DEPDIR)/libwaveout_a-waveout.Po"; else rm -f "$(DEPDIR)/libwaveout_a-waveout.Tpo"; exit 1; fi
+@@ -1682,6 +1773,20 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libportaudio_plugin_la_CFLAGS) $(CFLAGS) -c -o libportaudio_plugin_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c
+
++libpulse_builtin_la-pulse.lo: pulse.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_builtin_la_CFLAGS) $(CFLAGS) -MT libpulse_builtin_la-pulse.lo -MD -MP -MF "$(DEPDIR)/libpulse_builtin_la-pulse.Tpo" -c -o libpulse_builtin_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_builtin_la-pulse.Tpo" "$(DEPDIR)/libpulse_builtin_la-pulse.Plo"; else rm -f "$(DEPDIR)/libpulse_builtin_la-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_builtin_la-pulse.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_builtin_la_CFLAGS) $(CFLAGS) -c -o libpulse_builtin_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
++
++libpulse_plugin_la-pulse.lo: pulse.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_la_CFLAGS) $(CFLAGS) -MT libpulse_plugin_la-pulse.lo -MD -MP -MF "$(DEPDIR)/libpulse_plugin_la-pulse.Tpo" -c -o libpulse_plugin_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpulse_plugin_la-pulse.Tpo" "$(DEPDIR)/libpulse_plugin_la-pulse.Plo"; else rm -f "$(DEPDIR)/libpulse_plugin_la-pulse.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulse.c' object='libpulse_plugin_la-pulse.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_plugin_la_CFLAGS) $(CFLAGS) -c -o libpulse_plugin_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
++
+ libwaveout_builtin_la-waveout.lo: waveout.c
+ @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwaveout_builtin_la_CFLAGS) $(CFLAGS) -MT libwaveout_builtin_la-waveout.lo -MD -MP -MF "$(DEPDIR)/libwaveout_builtin_la-waveout.Tpo" -c -o libwaveout_builtin_la-waveout.lo `test -f 'waveout.c' || echo '$(srcdir)/'`waveout.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwaveout_builtin_la-waveout.Tpo" "$(DEPDIR)/libwaveout_builtin_la-waveout.Plo"; else rm -f "$(DEPDIR)/libwaveout_builtin_la-waveout.Tpo"; exit 1; fi
+diff -Nurd vlc-0.8.6.e.orig/modules/codec/cmml/Makefile.in vlc-0.8.6.e/modules/codec/cmml/Makefile.in
+--- vlc-0.8.6.e.orig/modules/codec/cmml/Makefile.in 2008-02-24 20:07:22.000000000 +0100
++++ vlc-0.8.6.e/modules/codec/cmml/Makefile.in 2008-03-15 15:34:54.000000000 +0100
+@@ -309,6 +309,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/codec/dmo/Makefile.in vlc-0.8.6.e/modules/codec/dmo/Makefile.in
+--- vlc-0.8.6.e.orig/modules/codec/dmo/Makefile.in 2008-02-24 20:07:22.000000000 +0100
++++ vlc-0.8.6.e/modules/codec/dmo/Makefile.in 2008-03-15 15:34:54.000000000 +0100
+@@ -291,6 +291,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/codec/ffmpeg/Makefile.in vlc-0.8.6.e/modules/codec/ffmpeg/Makefile.in
+--- vlc-0.8.6.e.orig/modules/codec/ffmpeg/Makefile.in 2008-02-24 20:07:23.000000000 +0100
++++ vlc-0.8.6.e/modules/codec/ffmpeg/Makefile.in 2008-03-15 15:34:54.000000000 +0100
+@@ -377,6 +377,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/codec/Makefile.in vlc-0.8.6.e/modules/codec/Makefile.in
+--- vlc-0.8.6.e.orig/modules/codec/Makefile.in 2008-02-24 20:07:22.000000000 +0100
++++ vlc-0.8.6.e/modules/codec/Makefile.in 2008-03-15 15:34:53.000000000 +0100
+@@ -963,6 +963,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/codec/spudec/Makefile.in vlc-0.8.6.e/modules/codec/spudec/Makefile.in
+--- vlc-0.8.6.e.orig/modules/codec/spudec/Makefile.in 2008-02-24 20:07:23.000000000 +0100
++++ vlc-0.8.6.e/modules/codec/spudec/Makefile.in 2008-03-15 15:34:54.000000000 +0100
+@@ -295,6 +295,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/control/http/Makefile.in vlc-0.8.6.e/modules/control/http/Makefile.in
+--- vlc-0.8.6.e.orig/modules/control/http/Makefile.in 2008-02-24 20:07:24.000000000 +0100
++++ vlc-0.8.6.e/modules/control/http/Makefile.in 2008-03-15 15:34:55.000000000 +0100
+@@ -301,6 +301,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/control/Makefile.in vlc-0.8.6.e/modules/control/Makefile.in
+--- vlc-0.8.6.e.orig/modules/control/Makefile.in 2008-02-24 20:07:24.000000000 +0100
++++ vlc-0.8.6.e/modules/control/Makefile.in 2008-03-15 15:34:55.000000000 +0100
+@@ -452,6 +452,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/asf/Makefile.in vlc-0.8.6.e/modules/demux/asf/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/asf/Makefile.in 2008-02-24 20:07:27.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/asf/Makefile.in 2008-03-15 15:34:57.000000000 +0100
+@@ -295,6 +295,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/avi/Makefile.in vlc-0.8.6.e/modules/demux/avi/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/avi/Makefile.in 2008-02-24 20:07:27.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/avi/Makefile.in 2008-03-15 15:34:57.000000000 +0100
+@@ -295,6 +295,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/Makefile.in vlc-0.8.6.e/modules/demux/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/Makefile.in 2008-02-24 20:07:26.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/Makefile.in 2008-03-15 15:34:56.000000000 +0100
+@@ -932,6 +932,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/mp4/Makefile.in vlc-0.8.6.e/modules/demux/mp4/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/mp4/Makefile.in 2008-02-24 20:07:27.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/mp4/Makefile.in 2008-03-15 15:34:57.000000000 +0100
+@@ -296,6 +296,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/mpeg/Makefile.in vlc-0.8.6.e/modules/demux/mpeg/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/mpeg/Makefile.in 2008-02-24 20:07:28.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/mpeg/Makefile.in 2008-03-15 15:34:57.000000000 +0100
+@@ -378,6 +378,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/playlist/Makefile.in vlc-0.8.6.e/modules/demux/playlist/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/playlist/Makefile.in 2008-02-24 20:07:28.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/playlist/Makefile.in 2008-03-15 15:34:58.000000000 +0100
+@@ -318,6 +318,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/demux/util/Makefile.in vlc-0.8.6.e/modules/demux/util/Makefile.in
+--- vlc-0.8.6.e.orig/modules/demux/util/Makefile.in 2008-02-24 20:07:29.000000000 +0100
++++ vlc-0.8.6.e/modules/demux/util/Makefile.in 2008-03-15 15:34:58.000000000 +0100
+@@ -291,6 +291,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/beos/Makefile.in vlc-0.8.6.e/modules/gui/beos/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/beos/Makefile.in 2008-02-24 20:07:29.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/beos/Makefile.in 2008-03-15 15:34:59.000000000 +0100
+@@ -342,6 +342,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/macosx/Makefile.in vlc-0.8.6.e/modules/gui/macosx/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/macosx/Makefile.in 2008-02-24 20:07:30.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/macosx/Makefile.in 2008-03-15 15:34:59.000000000 +0100
+@@ -368,6 +368,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/Makefile.in vlc-0.8.6.e/modules/gui/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/Makefile.in 2008-02-24 20:07:29.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/Makefile.in 2008-03-15 15:34:58.000000000 +0100
+@@ -292,6 +292,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/pda/Makefile.in vlc-0.8.6.e/modules/gui/pda/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/pda/Makefile.in 2008-02-24 20:07:31.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/pda/Makefile.in 2008-03-15 15:35:00.000000000 +0100
+@@ -303,6 +303,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/qnx/Makefile.in vlc-0.8.6.e/modules/gui/qnx/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/qnx/Makefile.in 2008-02-24 20:07:31.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/qnx/Makefile.in 2008-03-15 15:35:00.000000000 +0100
+@@ -294,6 +294,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/skins2/Makefile.in vlc-0.8.6.e/modules/gui/skins2/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/skins2/Makefile.in 2008-02-24 20:07:34.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/skins2/Makefile.in 2008-03-15 15:35:02.000000000 +0100
+@@ -691,6 +691,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/wince/Makefile.in vlc-0.8.6.e/modules/gui/wince/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/wince/Makefile.in 2008-02-24 20:07:34.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/wince/Makefile.in 2008-03-15 15:35:02.000000000 +0100
+@@ -339,6 +339,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/gui/wxwidgets/Makefile.in vlc-0.8.6.e/modules/gui/wxwidgets/Makefile.in
+--- vlc-0.8.6.e.orig/modules/gui/wxwidgets/Makefile.in 2008-02-24 20:07:35.000000000 +0100
++++ vlc-0.8.6.e/modules/gui/wxwidgets/Makefile.in 2008-03-15 15:35:03.000000000 +0100
+@@ -412,6 +412,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/Makefile.in vlc-0.8.6.e/modules/Makefile.in
+--- vlc-0.8.6.e.orig/modules/Makefile.in 2008-02-24 20:07:12.000000000 +0100
++++ vlc-0.8.6.e/modules/Makefile.in 2008-03-15 15:34:46.000000000 +0100
+@@ -243,6 +243,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/dummy/Makefile.in vlc-0.8.6.e/modules/misc/dummy/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/dummy/Makefile.in 2008-02-24 20:07:37.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/dummy/Makefile.in 2008-03-15 15:35:04.000000000 +0100
+@@ -310,6 +310,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/Makefile.in vlc-0.8.6.e/modules/misc/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/Makefile.in 2008-02-24 20:07:36.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/Makefile.in 2008-03-15 15:35:04.000000000 +0100
+@@ -635,6 +635,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/memcpy/Makefile.in vlc-0.8.6.e/modules/misc/memcpy/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/memcpy/Makefile.in 2008-02-24 20:07:37.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/memcpy/Makefile.in 2008-03-15 15:35:04.000000000 +0100
+@@ -404,6 +404,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/network/Makefile.in vlc-0.8.6.e/modules/misc/network/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/network/Makefile.in 2008-02-24 20:07:38.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/network/Makefile.in 2008-03-15 15:35:05.000000000 +0100
+@@ -312,6 +312,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/playlist/Makefile.in vlc-0.8.6.e/modules/misc/playlist/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/playlist/Makefile.in 2008-02-24 20:07:38.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/playlist/Makefile.in 2008-03-15 15:35:05.000000000 +0100
+@@ -300,6 +300,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/testsuite/Makefile.in vlc-0.8.6.e/modules/misc/testsuite/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/testsuite/Makefile.in 2008-02-24 20:07:38.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/testsuite/Makefile.in 2008-03-15 15:35:05.000000000 +0100
+@@ -401,6 +401,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/misc/xml/Makefile.in vlc-0.8.6.e/modules/misc/xml/Makefile.in
+--- vlc-0.8.6.e.orig/modules/misc/xml/Makefile.in 2008-02-24 20:07:39.000000000 +0100
++++ vlc-0.8.6.e/modules/misc/xml/Makefile.in 2008-03-15 15:35:05.000000000 +0100
+@@ -312,6 +312,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/mux/Makefile.in vlc-0.8.6.e/modules/mux/Makefile.in
+--- vlc-0.8.6.e.orig/modules/mux/Makefile.in 2008-02-24 20:07:39.000000000 +0100
++++ vlc-0.8.6.e/modules/mux/Makefile.in 2008-03-15 15:35:06.000000000 +0100
+@@ -439,6 +439,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/mux/mpeg/Makefile.in vlc-0.8.6.e/modules/mux/mpeg/Makefile.in
+--- vlc-0.8.6.e.orig/modules/mux/mpeg/Makefile.in 2008-02-24 20:07:40.000000000 +0100
++++ vlc-0.8.6.e/modules/mux/mpeg/Makefile.in 2008-03-15 15:35:06.000000000 +0100
+@@ -322,6 +322,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/mux/rtp/Makefile.in vlc-0.8.6.e/modules/mux/rtp/Makefile.in
+--- vlc-0.8.6.e.orig/modules/mux/rtp/Makefile.in 2008-02-24 20:07:40.000000000 +0100
++++ vlc-0.8.6.e/modules/mux/rtp/Makefile.in 2008-03-15 15:35:06.000000000 +0100
+@@ -290,6 +290,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/packetizer/Makefile.in vlc-0.8.6.e/modules/packetizer/Makefile.in
+--- vlc-0.8.6.e.orig/modules/packetizer/Makefile.in 2008-02-24 20:07:40.000000000 +0100
++++ vlc-0.8.6.e/modules/packetizer/Makefile.in 2008-03-15 15:35:07.000000000 +0100
+@@ -421,6 +421,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/services_discovery/Makefile.in vlc-0.8.6.e/modules/services_discovery/Makefile.in
+--- vlc-0.8.6.e.orig/modules/services_discovery/Makefile.in 2008-02-24 20:07:41.000000000 +0100
++++ vlc-0.8.6.e/modules/services_discovery/Makefile.in 2008-03-15 15:35:07.000000000 +0100
+@@ -458,6 +458,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/stream_out/Makefile.in vlc-0.8.6.e/modules/stream_out/Makefile.in
+--- vlc-0.8.6.e.orig/modules/stream_out/Makefile.in 2008-02-24 20:07:42.000000000 +0100
++++ vlc-0.8.6.e/modules/stream_out/Makefile.in 2008-03-15 15:35:08.000000000 +0100
+@@ -632,6 +632,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/stream_out/transrate/Makefile.in vlc-0.8.6.e/modules/stream_out/transrate/Makefile.in
+--- vlc-0.8.6.e.orig/modules/stream_out/transrate/Makefile.in 2008-02-24 20:07:42.000000000 +0100
++++ vlc-0.8.6.e/modules/stream_out/transrate/Makefile.in 2008-03-15 15:35:08.000000000 +0100
+@@ -307,6 +307,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_chroma/Makefile.in vlc-0.8.6.e/modules/video_chroma/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_chroma/Makefile.in 2008-02-24 20:07:43.000000000 +0100
++++ vlc-0.8.6.e/modules/video_chroma/Makefile.in 2008-03-15 15:35:09.000000000 +0100
+@@ -544,6 +544,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_filter/Makefile.in vlc-0.8.6.e/modules/video_filter/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_filter/Makefile.in 2008-02-24 20:07:44.000000000 +0100
++++ vlc-0.8.6.e/modules/video_filter/Makefile.in 2008-03-15 15:35:09.000000000 +0100
+@@ -735,6 +735,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_filter/swscale/Makefile.in vlc-0.8.6.e/modules/video_filter/swscale/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_filter/swscale/Makefile.in 2008-02-24 20:07:45.000000000 +0100
++++ vlc-0.8.6.e/modules/video_filter/swscale/Makefile.in 2008-03-15 15:35:10.000000000 +0100
+@@ -304,6 +304,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_output/directx/Makefile.in vlc-0.8.6.e/modules/video_output/directx/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_output/directx/Makefile.in 2008-02-24 20:07:46.000000000 +0100
++++ vlc-0.8.6.e/modules/video_output/directx/Makefile.in 2008-03-15 15:35:11.000000000 +0100
+@@ -358,6 +358,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_output/Makefile.in vlc-0.8.6.e/modules/video_output/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_output/Makefile.in 2008-02-24 20:07:46.000000000 +0100
++++ vlc-0.8.6.e/modules/video_output/Makefile.in 2008-03-15 15:35:11.000000000 +0100
+@@ -616,6 +616,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_output/qte/Makefile.in vlc-0.8.6.e/modules/video_output/qte/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_output/qte/Makefile.in 2008-02-24 20:07:46.000000000 +0100
++++ vlc-0.8.6.e/modules/video_output/qte/Makefile.in 2008-03-15 15:35:11.000000000 +0100
+@@ -299,6 +299,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/video_output/x11/Makefile.in vlc-0.8.6.e/modules/video_output/x11/Makefile.in
+--- vlc-0.8.6.e.orig/modules/video_output/x11/Makefile.in 2008-02-24 20:07:47.000000000 +0100
++++ vlc-0.8.6.e/modules/video_output/x11/Makefile.in 2008-03-15 15:35:11.000000000 +0100
+@@ -347,6 +347,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/visualization/galaktos/Makefile.in vlc-0.8.6.e/modules/visualization/galaktos/Makefile.in
+--- vlc-0.8.6.e.orig/modules/visualization/galaktos/Makefile.in 2008-02-24 20:07:48.000000000 +0100
++++ vlc-0.8.6.e/modules/visualization/galaktos/Makefile.in 2008-03-15 15:35:12.000000000 +0100
+@@ -363,6 +363,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/visualization/Makefile.in vlc-0.8.6.e/modules/visualization/Makefile.in
+--- vlc-0.8.6.e.orig/modules/visualization/Makefile.in 2008-02-24 20:07:47.000000000 +0100
++++ vlc-0.8.6.e/modules/visualization/Makefile.in 2008-03-15 15:35:12.000000000 +0100
+@@ -312,6 +312,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/modules/visualization/visual/Makefile.in vlc-0.8.6.e/modules/visualization/visual/Makefile.in
+--- vlc-0.8.6.e.orig/modules/visualization/visual/Makefile.in 2008-02-24 20:07:48.000000000 +0100
++++ vlc-0.8.6.e/modules/visualization/visual/Makefile.in 2008-03-15 15:35:12.000000000 +0100
+@@ -295,6 +295,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/mozilla/Makefile.in vlc-0.8.6.e/mozilla/Makefile.in
+--- vlc-0.8.6.e.orig/mozilla/Makefile.in 2008-02-24 20:07:49.000000000 +0100
++++ vlc-0.8.6.e/mozilla/Makefile.in 2008-03-15 15:35:13.000000000 +0100
+@@ -312,6 +312,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/share/Makefile.in vlc-0.8.6.e/share/Makefile.in
+--- vlc-0.8.6.e.orig/share/Makefile.in 2008-02-24 20:07:49.000000000 +0100
++++ vlc-0.8.6.e/share/Makefile.in 2008-03-15 15:35:13.000000000 +0100
+@@ -251,6 +251,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
+diff -Nurd vlc-0.8.6.e.orig/src/Makefile.in vlc-0.8.6.e/src/Makefile.in
+--- vlc-0.8.6.e.orig/src/Makefile.in 2008-02-24 20:07:50.000000000 +0100
++++ vlc-0.8.6.e/src/Makefile.in 2008-03-15 15:35:14.000000000 +0100
+@@ -548,6 +548,8 @@
+ POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
+ POSTPROC_LIBS = @POSTPROC_LIBS@
+ POSUB = @POSUB@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LIBS = @PULSE_LIBS@
+ RANLIB = @RANLIB@
+ SDL11_CONFIG = @SDL11_CONFIG@
+ SDL12_CONFIG = @SDL12_CONFIG@
diff -u vlc-0.8.6.e/debian/rules vlc-0.8.6.e/debian/rules
--- vlc-0.8.6.e/debian/rules
+++ vlc-0.8.6.e/debian/rules
@@ -75,6 +75,7 @@
--enable-faad \
--enable-mediacontrol-bindings \
--disable-x264 \
+ --enable-pulse \
$(NULL)
# Linux specific flags
diff -u vlc-0.8.6.e/debian/control vlc-0.8.6.e/debian/control
--- vlc-0.8.6.e/debian/control
+++ vlc-0.8.6.e/debian/control
@@ -78,7 +78,8 @@
libgtk2.0-dev,
python-dev,
libfaad-dev,
- libjack-dev
+ libjack-dev,
+ libpulse-dev (>= 0.9.8)
Standards-Version: 3.7.3
Homepage: http://www.videolan.org/vlc
Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/unstable/vlc
@@ -368,0 +370,14 @@
+Package: vlc-plugin-pulse
+Architecture: any
+Depends: vlc-nox,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: PulseAudio output plugin for VLC
+ This plugin adds support for PulseAudio to the VLC media player. To
+ activate it, use the `--aout pulse' flag or select the `pulse' audio
+ output plugin from the preferences menu.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
only in patch2:
unchanged:
--- vlc-0.8.6.e.orig/debian/patches/010_pulseaudio.diff
+++ vlc-0.8.6.e/debian/patches/010_pulseaudio.diff
@@ -0,0 +1,501 @@
+diff -Nurd vlc-0.8.6.e.orig/configure.ac vlc-0.8.6.e/configure.ac
+--- vlc-0.8.6.e.orig/configure.ac 2008-02-24 20:01:55.000000000 +0100
++++ vlc-0.8.6.e/configure.ac 2008-03-15 15:11:20.000000000 +0100
+@@ -4155,6 +4155,20 @@
+ fi])
+
+ dnl
++dnl Pulseaudio module
++dnl
++AC_ARG_ENABLE(pulse,
++ [ --enable-pulse Pulseaudio support (default enabled)])
++ if test "${enable_pulse}" != "no"
++ then
++ PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8,
++ [ VLC_ADD_PLUGINS([pulse])
++ VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
++ VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])]:,
++ [AC_MSG_WARN(pulsaudio library not found)])
++ fi
++
++dnl
+ dnl Portaudio module
+ dnl
+ AC_ARG_ENABLE(portaudio,
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_output/Modules.am vlc-0.8.6.e/modules/audio_output/Modules.am
+--- vlc-0.8.6.e.orig/modules/audio_output/Modules.am 2007-11-21 23:23:22.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_output/Modules.am 2008-03-15 15:11:20.000000000 +0100
+@@ -10,3 +10,4 @@
+ SOURCES_portaudio = portaudio.c
+ SOURCES_auhal = auhal.c
+ SOURCES_jack = jack.c
++SOURCES_pulse = pulse.c
+diff -Nurd vlc-0.8.6.e.orig/modules/audio_output/pulse.c vlc-0.8.6.e/modules/audio_output/pulse.c
+--- vlc-0.8.6.e.orig/modules/audio_output/pulse.c 1970-01-01 01:00:00.000000000 +0100
++++ vlc-0.8.6.e/modules/audio_output/pulse.c 2008-03-15 15:11:20.000000000 +0100
+@@ -0,0 +1,465 @@
++/*****************************************************************************
++ * pulse.c : Pulseaudio output plugin for vlc
++ *****************************************************************************
++ * Copyright (C) 2008 the VideoLAN team
++ *
++ * Authors: Martin Hamrle <hamrle @ post . cz>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
++ *****************************************************************************/
++
++/*****************************************************************************
++ * Preamble
++ *****************************************************************************/
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <vlc/vlc.h>
++#include <vlc/aout.h>
++#include "aout_internal.h"
++
++#include <pulse/pulseaudio.h>
++
++/*****************************************************************************
++ * aout_sys_t: Pulseaudio output method descriptor
++ *****************************************************************************
++ * This structure is part of the audio output thread descriptor.
++ * It describes the specific properties of an audio device.
++ *****************************************************************************/
++struct aout_sys_t
++{
++ /** PulseAudio playback stream object */
++ struct pa_stream *stream;
++
++ /** PulseAudio connection context */
++ struct pa_context *context;
++
++ /** Main event loop object */
++ struct pa_threaded_mainloop *mainloop;
++
++ int started;
++ size_t buffer_size;
++ mtime_t start_date;
++};
++
++#define PULSE_CLIENT_NAME N_("VLC media player")
++
++#if 0
++#define PULSE_DEBUG( ...) \
++ msg_Dbg( p_aout, __VA_ARGS__ )
++#else
++#define PULSE_DEBUG( ...) \
++ (void) 0
++#endif
++
++
++#define CHECK_DEAD_GOTO(label) do { \
++if (!p_sys->context || pa_context_get_state(p_sys->context) != PA_CONTEXT_READY || \
++ !p_sys->stream || pa_stream_get_state(p_sys->stream) != PA_STREAM_READY) { \
++ msg_Err(p_aout, "Connection died: %s", p_sys->context ? pa_strerror(pa_context_errno(p_sys->context)) : "NULL"); \
++ goto label; \
++ } \
++} while(0);
++/*****************************************************************************
++ * Local prototypes
++ *****************************************************************************/
++static int Open ( vlc_object_t * );
++static void Close ( vlc_object_t * );
++static void Play ( aout_instance_t * );
++
++static void context_state_cb(pa_context *c, void *userdata);
++static void stream_state_cb(pa_stream *s, void * userdata);
++static void stream_request_cb(pa_stream *s, size_t length, void *userdata);
++static void stream_latency_update_cb(pa_stream *s, void *userdata);
++static void success_cb(pa_stream *s, int sucess, void *userdata);
++static void uninit(aout_instance_t *p_aout);
++/*****************************************************************************
++ * Module descriptor
++ *****************************************************************************/
++vlc_module_begin();
++ set_shortname( "Pulse Audio" );
++ set_description( _("Pulseaudio audio output") );
++ set_capability( "audio output", 40 );
++ set_category( CAT_AUDIO );
++ set_subcategory( SUBCAT_AUDIO_AOUT );
++ add_shortcut( "pulseaudio" );
++ add_shortcut( "pa" );
++ set_callbacks( Open, Close );
++vlc_module_end();
++
++/*****************************************************************************
++ * Open: open the audio device
++ *****************************************************************************/
++static int Open ( vlc_object_t *p_this )
++{
++ aout_instance_t *p_aout = (aout_instance_t *)p_this;
++ struct aout_sys_t * p_sys;
++ struct pa_sample_spec ss;
++ const struct pa_buffer_attr *buffer_attr;
++ struct pa_buffer_attr a;
++ struct pa_channel_map map;
++
++ /* Allocate structures */
++ p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
++ if( p_sys == NULL )
++ return VLC_ENOMEM;
++ memset( p_sys, 0, sizeof( aout_sys_t ) );
++
++ PULSE_DEBUG( "Pulse start initialization");
++
++ ss.rate = p_aout->output.output.i_rate;
++ ss.channels = 2;
++
++ ss.format = PA_SAMPLE_S16LE;
++ p_aout->output.output.i_physical_channels =
++ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
++ p_aout->output.output.i_format = AOUT_FMT_S16_NE;
++
++ if (!pa_sample_spec_valid(&ss)) {
++ msg_Err(p_aout,"Invalid sample spec");
++ goto fail;
++ }
++
++ a.maxlength = pa_bytes_per_second(&ss)/4/pa_frame_size(&ss);
++ a.tlength = a.maxlength*9/10;
++ a.prebuf = a.tlength/2;
++ a.minreq = a.tlength/10;
++
++ a.maxlength *= pa_frame_size(&ss);
++ a.tlength *= pa_frame_size(&ss);
++ a.prebuf *= pa_frame_size(&ss);
++ a.minreq *= pa_frame_size(&ss);
++
++ p_sys->buffer_size = a.minreq;
++
++ pa_channel_map_init_stereo(&map);
++
++
++ if (!(p_sys->mainloop = pa_threaded_mainloop_new())) {
++ msg_Err(p_aout, "Failed to allocate main loop");
++ goto fail;
++ }
++
++ if (!(p_sys->context = pa_context_new(pa_threaded_mainloop_get_api(p_sys->mainloop), _( PULSE_CLIENT_NAME )))) {
++ msg_Err(p_aout, "Failed to allocate context");
++ goto fail;
++ }
++
++ pa_context_set_state_callback(p_sys->context, context_state_cb, p_aout);
++
++ PULSE_DEBUG( "Pulse before context connect");
++
++ if (pa_context_connect(p_sys->context, NULL, 0, NULL) < 0) {
++ msg_Err(p_aout, "Failed to connect to server: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ goto fail;
++ }
++
++ PULSE_DEBUG( "Pulse after context connect");
++
++ pa_threaded_mainloop_lock(p_sys->mainloop);
++
++ if (pa_threaded_mainloop_start(p_sys->mainloop) < 0) {
++ msg_Err(p_aout, "Failed to start main loop");
++ goto unlock_and_fail;
++ }
++
++ msg_Dbg(p_aout, "Pulse mainloop started");
++
++ /* Wait until the context is ready */
++ pa_threaded_mainloop_wait(p_sys->mainloop);
++
++ if (pa_context_get_state(p_sys->context) != PA_CONTEXT_READY) {
++ msg_Err(p_aout, "Failed to connect to server: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ goto unlock_and_fail;
++ }
++
++ if (!(p_sys->stream = pa_stream_new(p_sys->context, "audio stream", &ss, &map))) {
++ msg_Err(p_aout, "Failed to create stream: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ goto unlock_and_fail;
++ }
++
++ PULSE_DEBUG( "Pulse after new stream");
++
++ pa_stream_set_state_callback(p_sys->stream, stream_state_cb, p_aout);
++ pa_stream_set_write_callback(p_sys->stream, stream_request_cb, p_aout);
++ pa_stream_set_latency_update_callback(p_sys->stream, stream_latency_update_cb, p_aout);
++
++ if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
++ msg_Err(p_aout, "Failed to connect stream: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ goto unlock_and_fail;
++ }
++
++ PULSE_DEBUG("Pulse stream connect");
++
++ /* Wait until the stream is ready */
++ pa_threaded_mainloop_wait(p_sys->mainloop);
++
++ msg_Dbg(p_aout,"Pulse stream connected");
++
++ if (pa_stream_get_state(p_sys->stream) != PA_STREAM_READY) {
++ msg_Err(p_aout, "Failed to connect to server: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ goto unlock_and_fail;
++ }
++
++
++ PULSE_DEBUG("Pulse after stream get status");
++
++ pa_threaded_mainloop_unlock(p_sys->mainloop);
++
++ buffer_attr = pa_stream_get_buffer_attr(p_sys->stream);
++ p_aout->output.i_nb_samples = buffer_attr->minreq / pa_frame_size(&ss);
++ p_aout->output.pf_play = Play;
++ aout_VolumeSoftInit(p_aout);
++ msg_Dbg(p_aout, "Pulse initialized successfully");
++ {
++ char cmt[PA_CHANNEL_MAP_SNPRINT_MAX], sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
++
++ msg_Dbg(p_aout, "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u", buffer_attr->maxlength, buffer_attr->tlength, buffer_attr->prebuf, buffer_attr->minreq);
++ msg_Dbg(p_aout, "Using sample spec '%s', channel map '%s'.",
++ pa_sample_spec_snprint(sst, sizeof(sst), pa_stream_get_sample_spec(p_sys->stream)),
++ pa_channel_map_snprint(cmt, sizeof(cmt), pa_stream_get_channel_map(p_sys->stream)));
++
++ msg_Dbg(p_aout, "Connected to device %s (%u, %ssuspended).",
++ pa_stream_get_device_name(p_sys->stream),
++ pa_stream_get_device_index(p_sys->stream),
++ pa_stream_is_suspended(p_sys->stream) ? "" : "not ");
++ }
++
++ return VLC_SUCCESS;
++
++unlock_and_fail:
++ msg_Dbg(p_aout, "Pulse initialization unlock and fail");
++
++ if (p_sys->mainloop)
++ pa_threaded_mainloop_unlock(p_sys->mainloop);
++fail:
++ msg_Err(p_aout, "Pulse initialization failed");
++ uninit(p_aout);
++ return VLC_EGENERIC;
++}
++
++/*****************************************************************************
++ * Play: play a sound samples buffer
++ *****************************************************************************/
++static void Play( aout_instance_t * p_aout )
++{
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++
++ pa_operation *o;
++
++ if(!p_sys->started){
++ msg_Dbg(p_aout, "Pulse stream started");
++ p_sys->start_date =
++ aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
++ p_sys->started = 1;
++
++ pa_threaded_mainloop_lock(p_sys->mainloop);
++ if((o = pa_stream_flush(p_sys->stream, success_cb, p_aout))){
++ pa_operation_unref(o);
++ }
++ pa_threaded_mainloop_unlock(p_sys->mainloop);
++
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++ }
++}
++
++/*****************************************************************************
++ * Close: close the audio device
++ *****************************************************************************/
++static void Close ( vlc_object_t *p_this )
++{
++ aout_instance_t *p_aout = (aout_instance_t *)p_this;
++ struct aout_sys_t * p_sys = p_aout->output.p_sys;
++
++ msg_Dbg(p_aout, "Pulse Close");
++
++ if(p_sys->stream){
++ pa_operation *o;
++ pa_threaded_mainloop_lock(p_sys->mainloop);
++ pa_stream_set_write_callback(p_sys->stream, NULL, NULL);
++
++ if((o = pa_stream_drain(p_sys->stream, success_cb, p_aout))){
++ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
++ CHECK_DEAD_GOTO(fail);
++ pa_threaded_mainloop_wait(p_sys->mainloop);
++ }
++
++ fail:
++
++ pa_operation_unref(o);
++ }
++
++ pa_threaded_mainloop_unlock(p_sys->mainloop);
++ }
++ uninit(p_aout);
++}
++
++static void uninit(aout_instance_t *p_aout){
++ struct aout_sys_t * p_sys = p_aout->output.p_sys;
++
++ if (p_sys->mainloop)
++ pa_threaded_mainloop_stop(p_sys->mainloop);
++
++ if (p_sys->stream) {
++ pa_stream_disconnect(p_sys->stream);
++ pa_stream_unref(p_sys->stream);
++ p_sys->stream = NULL;
++ }
++
++ if (p_sys->context) {
++ pa_context_disconnect(p_sys->context);
++ pa_context_unref(p_sys->context);
++ p_sys->context = NULL;
++ }
++
++ if (p_sys->mainloop) {
++ pa_threaded_mainloop_free(p_sys->mainloop);
++ p_sys->mainloop = NULL;
++ }
++
++ free(p_sys);
++ p_aout->output.p_sys = NULL;
++}
++
++static void context_state_cb(pa_context *c, void *userdata) {
++ aout_instance_t *p_aout = (aout_instance_t *)userdata;
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++
++ assert(c);
++
++ PULSE_DEBUG( "Pulse context state changed");
++
++ switch (pa_context_get_state(c)) {
++ case PA_CONTEXT_READY:
++ case PA_CONTEXT_TERMINATED:
++ case PA_CONTEXT_FAILED:
++ PULSE_DEBUG( "Pulse context state changed signal");
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++ break;
++
++ case PA_CONTEXT_UNCONNECTED:
++ case PA_CONTEXT_CONNECTING:
++ case PA_CONTEXT_AUTHORIZING:
++ case PA_CONTEXT_SETTING_NAME:
++ PULSE_DEBUG( "Pulse context state changed no signal");
++ break;
++ }
++}
++
++static void stream_state_cb(pa_stream *s, void * userdata) {
++ aout_instance_t *p_aout = (aout_instance_t *)userdata;
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++
++ assert(s);
++
++ PULSE_DEBUG( "Pulse stream state changed");
++
++ switch (pa_stream_get_state(s)) {
++
++ case PA_STREAM_READY:
++ case PA_STREAM_FAILED:
++ case PA_STREAM_TERMINATED:
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++ break;
++
++ case PA_STREAM_UNCONNECTED:
++ case PA_STREAM_CREATING:
++ break;
++ }
++}
++
++static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
++ aout_instance_t *p_aout = (aout_instance_t *)userdata;
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++ mtime_t next_date;
++
++ assert(s);
++ assert(p_sys);
++
++ size_t buffer_size = p_sys->buffer_size;
++
++ PULSE_DEBUG( "Pulse stream request %d", length);
++
++ do{
++ aout_buffer_t * p_buffer = NULL;
++ if(p_sys->started){
++ pa_usec_t latency;
++ int negative;
++ if(pa_stream_get_latency(p_sys->stream, &latency, &negative)<0){
++ if (pa_context_errno(p_sys->context) != PA_ERR_NODATA) {
++ msg_Err(p_aout, "pa_stream_get_latency() failed: %s", pa_strerror(pa_context_errno(p_sys->context)));
++ }
++ latency = 0;
++
++ }
++ PULSE_DEBUG( "Pulse stream request latency="I64Fd"", latency);
++ next_date = mdate() + latency;
++
++
++ if(p_sys->start_date < next_date + AOUT_PTS_TOLERANCE ){
++ /*
++ vlc_mutex_lock( &p_aout->output_fifo_lock );
++ p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
++ vlc_mutex_unlock( &p_aout->output_fifo_lock );
++ */
++ p_buffer = aout_OutputNextBuffer( p_aout, next_date, 0);
++ }
++ }
++
++ if ( p_buffer != NULL )
++ {
++ PULSE_DEBUG( "Pulse stream request write buffer %d", p_buffer->i_nb_bytes);
++ pa_stream_write(p_sys->stream, p_buffer->p_buffer, p_buffer->i_nb_bytes, NULL, 0, PA_SEEK_RELATIVE);
++ length -= p_buffer->i_nb_bytes;
++ aout_BufferFree( p_buffer );
++ }
++ else
++ {
++ PULSE_DEBUG( "Pulse stream request write zeroes");
++ void *data = pa_xmalloc(buffer_size);
++ bzero(data, buffer_size);
++ pa_stream_write(p_sys->stream, data, buffer_size, pa_xfree, 0, PA_SEEK_RELATIVE);
++ length -= buffer_size;
++ }
++ }while(length > buffer_size);
++
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++}
++
++static void stream_latency_update_cb(pa_stream *s, void *userdata) {
++ aout_instance_t *p_aout = (aout_instance_t *)userdata;
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++
++ assert(s);
++
++ PULSE_DEBUG( "Pulse stream latency update");
++
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++}
++
++static void success_cb(pa_stream *s, int sucess, void *userdata)
++{
++ aout_instance_t *p_aout = (aout_instance_t *)userdata;
++ struct aout_sys_t * p_sys = (struct aout_sys_t *) p_aout->output.p_sys;
++
++ (void)sucess;
++
++ assert(s);
++
++ pa_threaded_mainloop_signal(p_sys->mainloop, 0);
++}
++
++#undef PULSE_DEBUG
only in patch2:
unchanged:
--- vlc-0.8.6.e.orig/debian/vlc-plugin-pulse.install
+++ vlc-0.8.6.e/debian/vlc-plugin-pulse.install
@@ -0,0 +1 @@
+usr/lib/vlc/audio_output/libpulse_plugin.so
only in patch2:
unchanged:
--- vlc-0.8.6.e.orig/debian/vlc-plugin-pulse.links
+++ vlc-0.8.6.e/debian/vlc-plugin-pulse.links
@@ -0,0 +1 @@
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-pulse
More information about the pkg-multimedia-maintainers
mailing list