Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/vlc/1.1-git: 350_all_pulseaudio_automagic.patch series
Date: Wed, 21 Dec 2011 11:58:40
Message-Id: 20111221115830.E1F572004B@flycatcher.gentoo.org
1 aballier 11/12/21 11:58:30
2
3 Modified: series
4 Added: 350_all_pulseaudio_automagic.patch
5 Log:
6 forward port patch
7
8 Revision Changes Path
9 1.6 src/patchsets/vlc/1.1-git/series
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?rev=1.6&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?rev=1.6&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?r1=1.5&r2=1.6
14
15 Index: series
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/1.1-git/series,v
18 retrieving revision 1.5
19 retrieving revision 1.6
20 diff -u -r1.5 -r1.6
21 --- series 24 May 2011 14:42:24 -0000 1.5
22 +++ series 21 Dec 2011 11:58:30 -0000 1.6
23 @@ -2,3 +2,4 @@
24 020_all_check_headers_regexps.patch
25 300_all_pic.patch
26 320_all_cachegen.patch
27 +350_all_pulseaudio_automagic.patch
28
29
30
31 1.1 src/patchsets/vlc/1.1-git/350_all_pulseaudio_automagic.patch
32
33 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/350_all_pulseaudio_automagic.patch?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/350_all_pulseaudio_automagic.patch?rev=1.1&content-type=text/plain
35
36 Index: 350_all_pulseaudio_automagic.patch
37 ===================================================================
38 Fix pulseaudio automagic.
39 https://bugs.gentoo.org/show_bug.cgi?id=394249
40
41 Index: vlc-1.1.12/configure.ac
42 ===================================================================
43 --- vlc-1.1.12.orig/configure.ac
44 +++ vlc-1.1.12/configure.ac
45 @@ -3749,23 +3749,7 @@ fi
46 dnl
47 dnl PulseAudio module
48 dnl
49 -PKG_CHECK_MODULES( PULSE, [libpulse >= 0.9.22], [
50 - VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
51 - VLC_ADD_LIBS([pulse],[${PULSE_LIBS}])
52 - VLC_ADD_PLUGIN([pulse])
53 - ], [
54 - AS_IF([test "${no_x}" = "yes"], [
55 - AS_IF([test "${enable_pulse}" = "yes"], [
56 - AC_MSG_ERROR([Xlib is required for VLC PulseAudio support
57 - (see http://www.pulseaudio.org/ticket/799 for further reference).])
58 - ])
59 - ], [
60 - PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
61 - VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
62 - AC_MSG_WARN(It is STRONGLY advised to update to pulse 0.9.22)
63 - ])
64 -])
65 -
66 +PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.22], [Pulseaudio support], [auto])
67
68 dnl
69 dnl Portaudio module