diff -Nru vlc-1.1.4/debian/changelog vlc-1.1.4/debian/changelog --- vlc-1.1.4/debian/changelog 2011-01-05 22:18:39.000000000 +0000 +++ vlc-1.1.4/debian/changelog 2011-01-13 20:57:37.000000000 +0000 @@ -1,3 +1,11 @@ +vlc (1.1.4-1ubuntu1.3) maverick-proposed; urgency=low + + * Add 0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch + from upstream, use xcb instead of xlib, stops crashes with pulse + LP: #702493 + + -- Jonathan Riddell Thu, 13 Jan 2011 20:56:43 +0000 + vlc (1.1.4-1ubuntu1.2) maverick-security; urgency=low * SECURITY UPDATE: Buffer overflow in Real demuxer (LP: #690173) diff -Nru vlc-1.1.4/debian/patches/0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch vlc-1.1.4/debian/patches/0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch --- vlc-1.1.4/debian/patches/0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch 1970-01-01 01:00:00.000000000 +0100 +++ vlc-1.1.4/debian/patches/0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch 2011-01-13 20:56:34.000000000 +0000 @@ -0,0 +1,34 @@ +From 3e5a315671f1c5da966d1f207a5eddb503f359a6 Mon Sep 17 00:00:00 2001 +From: Colin Guthrie +Date: Thu, 25 Nov 2010 12:40:50 +0000 +Subject: [PATCH 101/101] pulse: Disable xlib in pulse. libpulse now uses xcb only. + +--- + modules/audio_output/pulse.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +Index: vlc-1.1.4/modules/audio_output/pulse.c +=================================================================== +--- vlc-1.1.4.orig/modules/audio_output/pulse.c 2011-01-05 18:19:13.383813000 +0100 ++++ vlc-1.1.4/modules/audio_output/pulse.c 2011-01-05 18:19:25.211813001 +0100 +@@ -34,10 +34,6 @@ + #include + + #include +-#ifdef X_DISPLAY_MISSING +-# error Xlib required due to PulseAudio bug 799! +-#endif +-#include + + #include + +@@ -122,9 +118,6 @@ + struct pa_buffer_attr a; + struct pa_channel_map map; + +- if( !vlc_xlib_init( p_this ) ) +- return VLC_EGENERIC; +- + /* Allocate structures */ + p_aout->output.p_sys = p_sys = calloc( 1, sizeof( aout_sys_t ) ); + if( p_sys == NULL ) diff -Nru vlc-1.1.4/debian/patches/series vlc-1.1.4/debian/patches/series --- vlc-1.1.4/debian/patches/series 2011-01-05 22:18:39.000000000 +0000 +++ vlc-1.1.4/debian/patches/series 2011-01-13 20:56:39.000000000 +0000 @@ -2,3 +2,4 @@ 200_osdmenu_paths.diff 300_transcode_aspect_ratio.diff CVE-2010-3907.diff +0101-pulse-Disable-xlib-in-pulse.-libpulse-now-uses-xcb-o.patch