/[gentoo-x86]/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch
Gentoo

Contents of /net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Fri Apr 6 08:00:09 2012 UTC (2 years, 8 months ago) by tetromino
Branch: MAIN
Make pulseaudio optional (bug #399111).

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

1 From 2262cd59322d8351be5fcb67bf4229cca35c8764 Mon Sep 17 00:00:00 2001
2 From: Alexandre Rostovtsev <tetromino@gentoo.org>
3 Date: Fri, 6 Apr 2012 03:33:41 -0400
4 Subject: [PATCH] configure: make pulseaudio detection non-automagic
5
6 This is to allow building gtk-vnc on a system with pulseaudio and then
7 deploying on a system without pulseaudio.
8
9 https://bugzilla.gnome.org/show_bug.cgi?id=673570
10 ---
11 configure.ac | 21 +++++++++++++++++----
12 1 files changed, 17 insertions(+), 4 deletions(-)
13
14 diff --git a/configure.ac b/configure.ac
15 index 8eebe41..df213d5 100644
16 --- a/configure.ac
17 +++ b/configure.ac
18 @@ -216,11 +216,23 @@ AC_SUBST(VIEW_CFLAGS)
19 AC_SUBST(VIEW_LIBS)
20
21
22 -PKG_CHECK_MODULES(PULSEAUDIO, libpulse-simple, WANT_PULSEAUDIO="yes", AC_MSG_NOTICE([Not building against libpulse]))
23 -if test "x$WANT_PULSEAUDIO" = xyes; then
24 - AC_DEFINE_UNQUOTED([HAVE_PULSEAUDIO], 1,[Define if we have and want pulseaudio.])
25 +AC_ARG_WITH(pulseaudio,
26 + [AS_HELP_STRING([--with-pulseaudio],
27 + [use PulseAudio for audio playback @<:@default=check@:>@])],
28 + [],
29 + [with_pulseaudio=check])
30 +
31 +HAVE_PULSEAUDIO=no
32 +if test "x$with_pulseaudio" != "xno"; then
33 + PULSEAUDIO_MODULES=libpulse-simple
34 + if test "x$with_pulseaudio" == "xyes"; then
35 + PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes])
36 + else
37 + PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes],
38 + [AC_MSG_NOTICE([libpulse-simple not found, disabling PulseAudio support])])
39 + fi
40 fi
41 -AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$WANT_PULSEAUDIO" = "xyes"])
42 +AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$HAVE_PULSEAUDIO" = "xyes"])
43 AC_SUBST(PULSEAUDIO_CFLAGS)
44 AC_SUBST(PULSEAUDIO_LIBS)
45
46 @@ -477,5 +489,6 @@ Configure summary:
47 Install example programs ...: ${WITH_EXAMPLES}
48 Browser plugin .............: ${enable_plugin}
49 SASL support................: ${enable_sasl}
50 + PulseAudio support..........: ${HAVE_PULSEAUDIO}
51 GTK+ version................: ${GTK_API_VERSION}
52 "
53 --
54 1.7.8.5

  ViewVC Help
Powered by ViewVC 1.1.20