| 1 |
tetromino 12/04/06 08:00:09 |
| 2 |
|
| 3 |
Added: gtk-vnc-0.5.0-pulseaudio-automagic.patch |
| 4 |
Log: |
| 5 |
Make pulseaudio optional (bug #399111). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gtk-vnc-0.5.0-pulseaudio-automagic.patch |
| 16 |
=================================================================== |
| 17 |
From 2262cd59322d8351be5fcb67bf4229cca35c8764 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Fri, 6 Apr 2012 03:33:41 -0400 |
| 20 |
Subject: [PATCH] configure: make pulseaudio detection non-automagic |
| 21 |
|
| 22 |
This is to allow building gtk-vnc on a system with pulseaudio and then |
| 23 |
deploying on a system without pulseaudio. |
| 24 |
|
| 25 |
https://bugzilla.gnome.org/show_bug.cgi?id=673570 |
| 26 |
--- |
| 27 |
configure.ac | 21 +++++++++++++++++---- |
| 28 |
1 files changed, 17 insertions(+), 4 deletions(-) |
| 29 |
|
| 30 |
diff --git a/configure.ac b/configure.ac |
| 31 |
index 8eebe41..df213d5 100644 |
| 32 |
--- a/configure.ac |
| 33 |
+++ b/configure.ac |
| 34 |
@@ -216,11 +216,23 @@ AC_SUBST(VIEW_CFLAGS) |
| 35 |
AC_SUBST(VIEW_LIBS) |
| 36 |
|
| 37 |
|
| 38 |
-PKG_CHECK_MODULES(PULSEAUDIO, libpulse-simple, WANT_PULSEAUDIO="yes", AC_MSG_NOTICE([Not building against libpulse])) |
| 39 |
-if test "x$WANT_PULSEAUDIO" = xyes; then |
| 40 |
- AC_DEFINE_UNQUOTED([HAVE_PULSEAUDIO], 1,[Define if we have and want pulseaudio.]) |
| 41 |
+AC_ARG_WITH(pulseaudio, |
| 42 |
+ [AS_HELP_STRING([--with-pulseaudio], |
| 43 |
+ [use PulseAudio for audio playback @<:@default=check@:>@])], |
| 44 |
+ [], |
| 45 |
+ [with_pulseaudio=check]) |
| 46 |
+ |
| 47 |
+HAVE_PULSEAUDIO=no |
| 48 |
+if test "x$with_pulseaudio" != "xno"; then |
| 49 |
+ PULSEAUDIO_MODULES=libpulse-simple |
| 50 |
+ if test "x$with_pulseaudio" == "xyes"; then |
| 51 |
+ PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes]) |
| 52 |
+ else |
| 53 |
+ PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes], |
| 54 |
+ [AC_MSG_NOTICE([libpulse-simple not found, disabling PulseAudio support])]) |
| 55 |
+ fi |
| 56 |
fi |
| 57 |
-AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$WANT_PULSEAUDIO" = "xyes"]) |
| 58 |
+AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$HAVE_PULSEAUDIO" = "xyes"]) |
| 59 |
AC_SUBST(PULSEAUDIO_CFLAGS) |
| 60 |
AC_SUBST(PULSEAUDIO_LIBS) |
| 61 |
|
| 62 |
@@ -477,5 +489,6 @@ Configure summary: |
| 63 |
Install example programs ...: ${WITH_EXAMPLES} |
| 64 |
Browser plugin .............: ${enable_plugin} |
| 65 |
SASL support................: ${enable_sasl} |
| 66 |
+ PulseAudio support..........: ${HAVE_PULSEAUDIO} |
| 67 |
GTK+ version................: ${GTK_API_VERSION} |
| 68 |
" |
| 69 |
-- |
| 70 |
1.7.8.5 |
Archives