Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/guvcview/files: guvcview-1.1.0-automagic_pulseaudio.patch
Date: Sat, 30 May 2009 11:50:49
Message-Id: E1MAN5M-00022X-3e@stork.gentoo.org
1 ssuominen 09/05/30 11:50:48
2
3 Added: guvcview-1.1.0-automagic_pulseaudio.patch
4 Log:
5 Patch pulseaudio to have AC_ARG_ENABLE for controlling the feature with correct version checking.
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch?rev=1.1&content-type=text/plain
13
14 Index: guvcview-1.1.0-automagic_pulseaudio.patch
15 ===================================================================
16 diff -ur guvcview-src-1.1.0.orig/configure.in guvcview-src-1.1.0/configure.in
17 --- guvcview-src-1.1.0.orig/configure.in 2009-05-11 00:18:57.000000000 +0300
18 +++ guvcview-src-1.1.0/configure.in 2009-05-30 14:44:45.000000000 +0300
19 @@ -26,15 +26,17 @@
20 AC_SUBST(PACKAGE_LIBS)
21
22 dnl Check for pulseaudio
23 -PKG_CHECK_MODULES(PULSE, [libpulse-simple],
24 - [AC_DEFINE(PULSEAUDIO,1,[Define if pulse headers presence detected])],
25 - [ echo '--------------------------------------------------'
26 - echo 'Pulse Audio development package not detected'
27 - echo 'Compiling Guvcview without Pulse Support.'
28 - echo '--------------------------------------------------'])
29 -
30 -AC_SUBST(PULSE_CFLAGS)
31 -AC_SUBST(PULSE_LIBS)
32 +AC_ARG_ENABLE(pulse, AS_HELP_STRING([--disable-pulse],
33 + [disable pulseaudio support (default: enabled)]),,
34 + [enable_pulse=yes])
35 +
36 +if test x$enable_pulse = xyes; then
37 + PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.15, HAVE_PULSE=yes, HAVE_PULSE=no)
38 + AC_SUBST(PULSE_CFLAGS)
39 + AC_SUBST(PULSE_LIBS)
40 +else
41 + HAVE_PULSE=no
42 +fi
43
44 dnl Check for avcodec.h directly
45 dnl if all tests fail must add avcodec.h path to C_INCLUDE_PATH before running configure