[SCM] vlc/master: Backport PulseAudio build fix.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 68d233891acc71fb7fb43b4e72ab0509b854e96f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jun 7 00:59:13 2011 +0200

    Backport PulseAudio build fix.

diff --git a/debian/patches/bp-pulseaudio-build-fix.patch b/debian/patches/bp-pulseaudio-build-fix.patch
new file mode 100644
index 0000000..b624f2f
--- /dev/null
+++ b/debian/patches/bp-pulseaudio-build-fix.patch
@@ -0,0 +1,17 @@
+From: Pierre Ynard <linkfanel at yahoo.fr>
+Date: Mon, 6 Jun 2011 23:31:05 +0200
+Subject: [PATCH] PulseAudio: build fix
+Origin: upstream, http://git.videolan.org/?p=vlc/vlc-1.1.git;a=commit;h=90c91a987009701df006265185d29b1fbda134b7
+Applied-Upstream: 1.1.11
+
+--- a/modules/audio_output/pulse.c
++++ b/modules/audio_output/pulse.c
+@@ -273,7 +273,7 @@
+     aout_instance_t *aout = (aout_instance_t *)obj;
+ 
+ #if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22)
+-    if( !vlc_xlib_init( p_this ) )
++    if( !vlc_xlib_init( obj ) )
+         return VLC_EGENERIC;
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3400aa7..2f58d0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 200_osdmenu_paths.patch
 xulrunner-1.9.1.patch
 900_weaken_schroedinger_deps.diff
+bp-pulseaudio-build-fix.patch

-- 
VLC media player packaging