Patch pulseaudio to have AC_ARG_ENABLE for controlling the feature with correct version checking.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 51 insertions, 8 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 4ec43f0662a4..3368f41b5384 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/guvcview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.7 2009/05/29 21:45:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.8 2009/05/30 11:50:47 ssuominen Exp $
+
+  30 May 2009; Samuli Suominen <ssuominen@gentoo.org> guvcview-1.1.0.ebuild,
+  +files/guvcview-1.1.0-automagic_pulseaudio.patch:
+  Patch pulseaudio to have AC_ARG_ENABLE for controlling the feature with
+  correct version checking.
 
   29 May 2009; Samuli Suominen <ssuominen@gentoo.org> guvcview-1.1.0.ebuild:
   USE pulseaudio for >=0.9.15 and don't allow previous versions installed
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 8498e8281b90..52b7dde558b0 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,7 +1,8 @@
 AUX guvcview-1.0.5-implicit_declaration_setlocale.patch 585 RMD160 fe183ab85282bd927f247c070cc59885d1036510 SHA1 94b5bbd271663d0218c245cb6397d18e85a1afb3 SHA256 dd231e49540a0ed4604f4a37ed14608a24e074dc590d469912ca457769d35904
+AUX guvcview-1.1.0-automagic_pulseaudio.patch 1162 RMD160 50515fe9efe74a710ba5b441c01d192666a1575d SHA1 ffb1b9dedf89ee8ae23fafb3367057bcfc04e220 SHA256 92c9f0fbf5f0ba3856496c06c5699ac3f574c9a8cada5104ab1140619e8faea5
 DIST guvcview-src-1.0.5.tar.gz 529290 RMD160 3da44bbd9b127b3bbdd1d77a0f0a47eafb0957c6 SHA1 83190eab57458a92fc748047503c80155c934522 SHA256 050310f1e5c2778b1af98bd8d343b4ebdb4f8c717dbf05c33a15dd6d58f76d82
 DIST guvcview-src-1.1.0.tar.gz 442322 RMD160 e88e2f726b56f4f6914bc9f681ba78a92b3c1929 SHA1 b2bd630c3b59f9cc239550bfd5111c4d3a3e0a79 SHA256 6c89329bfd8296151c898495e35087f6126d1aaa697a20b03ddb2cbd22c4dd1e
 EBUILD guvcview-1.0.5.ebuild 955 RMD160 33db1c09cc21397015564b5ac4cd79a34fc8ab31 SHA1 32c820a1ed38bf72e6a28eaa8bfc9f0937f7aad4 SHA256 8a094fb7a228950dd8d415333d66e2d8432078382069298171602ae46648e470
-EBUILD guvcview-1.1.0.ebuild 1096 RMD160 e5903602bb71c26a9c2fae2402cd027d91d01862 SHA1 3ef53931bafce17f7392d4f4d0bc608fe74c1878 SHA256 4656f28b9f8bb151c5d66e4a9ef954860130473ff5444e0373012b786aa268e6
-MISC ChangeLog 1489 RMD160 a5e2080b56c6296248aac8e90edfe5d40bd9581a SHA1 cb78d26dec767776a9fa15e4c5eadd1dd700276e SHA256 2a40876328f7b93c21fdfd623da046785d017fcd3d7bf2890f10db4238ca0781
+EBUILD guvcview-1.1.0.ebuild 1237 RMD160 befe9e0ba3ed4ce4fb1133763ebcc58365452b48 SHA1 a8b5abc75ce01f44f75ed7d430b0b04c2fc479f3 SHA256 0c83fbe98797b3d68cf16db771b19d82c56f3751662b8f3e72c2773ba7ac7e24
+MISC ChangeLog 1721 RMD160 f680cc274c60902eaddb3c449783bc7fdd9a0850 SHA1 2aed6d5f1b2aaea2b6847060aa0f2acfb0ab8c7a SHA256 0a52811c8d2a477c8801ebf1e9114baad18a227099a679b8db1eb24631ad358a
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch b/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch
new file mode 100644
index 000000000000..93cfb3ae9c32
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch
@@ -0,0 +1,30 @@
+diff -ur guvcview-src-1.1.0.orig/configure.in guvcview-src-1.1.0/configure.in
+--- guvcview-src-1.1.0.orig/configure.in	2009-05-11 00:18:57.000000000 +0300
++++ guvcview-src-1.1.0/configure.in	2009-05-30 14:44:45.000000000 +0300
+@@ -26,15 +26,17 @@
+ AC_SUBST(PACKAGE_LIBS)
+ 
+ dnl Check for pulseaudio
+-PKG_CHECK_MODULES(PULSE, [libpulse-simple],
+-  [AC_DEFINE(PULSEAUDIO,1,[Define if pulse headers presence detected])], 
+-  [ echo '--------------------------------------------------'
+-    echo 'Pulse Audio development package not detected'
+-    echo 'Compiling Guvcview without Pulse Support.'
+-    echo '--------------------------------------------------'])
+-
+-AC_SUBST(PULSE_CFLAGS)
+-AC_SUBST(PULSE_LIBS)
++AC_ARG_ENABLE(pulse, AS_HELP_STRING([--disable-pulse],
++		[disable pulseaudio support (default: enabled)]),,
++	[enable_pulse=yes])
++
++if test x$enable_pulse = xyes; then
++	PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.15, HAVE_PULSE=yes, HAVE_PULSE=no)
++	AC_SUBST(PULSE_CFLAGS)
++	AC_SUBST(PULSE_LIBS)
++else
++	HAVE_PULSE=no
++fi
+ 
+ dnl Check for avcodec.h directly
+ dnl if all tests fail must add avcodec.h path to C_INCLUDE_PATH before running configure
diff --git a/media-video/guvcview/guvcview-1.1.0.ebuild b/media-video/guvcview/guvcview-1.1.0.ebuild
index 2277d18d5f1a..7cc2befaa4ca 100644
--- a/media-video/guvcview/guvcview-1.1.0.ebuild
+++ b/media-video/guvcview/guvcview-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.0.ebuild,v 1.2 2009/05/29 21:45:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.0.ebuild,v 1.3 2009/05/30 11:50:47 ssuominen Exp $
 
 EAPI=2
-inherit eutils
+inherit autotools eutils
 
 MY_P=${PN}-src-${PV}
 
@@ -27,13 +27,20 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext
-	!<media-sound/pulseaudio-0.9.15"
+	sys-devel/gettext"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "$FILESDIR"/$PN-1.0.5-implicit_declaration_setlocale.patch
+	epatch "${FILESDIR}"/${PN}-1.0.5-implicit_declaration_setlocale.patch \
+		"${FILESDIR}"/${P}-automagic_pulseaudio.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable pulseaudio pulse)
 }
 
 src_install() {