Fix automagic jack-audio-connection-kit depend wrt #266346, thanks to Paolo Pedroni for reporting.

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

5 files changed, 51 insertions, 26 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index d3fdec720483..6966f8edaa11 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.96 2009/04/15 19:45:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.97 2009/05/08 11:54:15 ssuominen Exp $
+
+  08 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libsndfile-1.0.19.ebuild, +files/libsndfile-1.0.19-automagic_jack.patch:
+  Fix automagic jack-audio-connection-kit depend wrt #266346, thanks to
+  Paolo Pedroni for reporting.
 
   15 Apr 2009; Markus Meier <maekke@gentoo.org> libsndfile-1.0.19.ebuild:
   amd64 stable, bug #261173
@@ -75,7 +80,7 @@
   just removing it after the fact. Don't request old version of automake, as
   full eautoreconf is called.
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   libsndfile-1.0.17-r1.ebuild:
   If built with USE -sqlite don't install sndfile-regtest command wrt #210216
   by Matthias B.
@@ -111,7 +116,7 @@
   +libsndfile-1.0.17-r1.ebuild:
   add a patch wrt to buffer overflow possibility, bug #192834
 
-  06 Aug 2007; Samuli Suominen <drac@gentoo.org> libsndfile-1.0.17.ebuild:
+  06 Aug 2007; Samuli Suominen <ssuominen@gentoo.org> libsndfile-1.0.17.ebuild:
   Install pkgconfig for bug 187856.
 
   21 Jun 2007; Joshua Kinard <kumba@gentoo.org> libsndfile-1.0.17.ebuild:
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index b09c69ead85e..57cb0e0bfe57 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libsndfile-1.0.17-autotools.patch 291 RMD160 f77db5290d99b8c5270b2f42cd4d8d0068743268 SHA1 d05b75a2b92a1f3a7bb82454be8cc871d5bacfae SHA256 1b0b3d3b4c547498cccdcea961a70ee8054568dcbd758a7305b093f61f600354
 AUX libsndfile-1.0.17-dontbuild-tests-examples.patch 1136 RMD160 db06699e750c011fa2b615bb8f1959732b2ca256 SHA1 a5cb295572987e79288222aed7697bddc07dc82d SHA256 1eae0c560959f33e1e8fc482890d8c1fab3746d251b3eb57e9235f92c8acacd6
 AUX libsndfile-1.0.17-flac-buffer-overflow.patch 1518 RMD160 41fbc8cddbc252f6b49a8a19d48ec4a09966371d SHA1 aaa818fdfa35002af77b84b19398dae5c3f53744 SHA256 f080aa485cdcc5940ba4e54f6f7295233c4947f2ba6a6dbe6681036a655543d6
@@ -8,6 +5,7 @@ AUX libsndfile-1.0.17-ogg.patch 385 RMD160 7f2bee213423b77b7a03f209b75ababcbe21f
 AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 RMD160 a36d14dc91a8768386f414cbfe8b0cc53de938c3 SHA1 522d55e46ef6c83a158fb026d5f37f63b78438ad SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73
 AUX libsndfile-1.0.18-less_strict_tests.patch 1500 RMD160 c7ed99205da9955befb6f0efd91c3247bc7d7df1 SHA1 eece06074647a0830a2c743ee8800f14bce0b9d3 SHA256 ed3143214c6bd7fd0f2eb3db25e573064aae338295664a1e6768872e8ebb52a8
 AUX libsndfile-1.0.18-m4macro.patch 482 RMD160 6ff4ae5bd60222053fb6b01701e7485089d2cc84 SHA1 2c6e94d8410ed4393bcca763aac35c48c11bfcc8 SHA256 e7fa7b56f51b3fe18729f407b8e8b9ff24e18a6557d6094189febabcd27bf266
+AUX libsndfile-1.0.19-automagic_jack.patch 956 RMD160 1f3527edd5cf91200531d3dd3c08197c73134c75 SHA1 c36e48e9df6202a1dafb44b0ec3d3ee673021ee7 SHA256 b65e23f28d3faf6eec5292c3a0b0e484f7c09f452211145d3235c32327f9619f
 DIST libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127 RMD160 fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 SHA1 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519 SHA256 2c8b6df283309061e8e9aaedd0bc20c7ebf75fa8ad4ed8b01f7bf04162206df1
 DIST libsndfile-1.0.17.tar.gz 819456 RMD160 ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 SHA1 2f66798d596a15491fbd1191ded8125ed71ef411 SHA256 1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2
 DIST libsndfile-1.0.18.tar.gz 923666 RMD160 15b19f4df1d8ced6c25e234258fb3d88fe3cd2ae SHA1 d0fb643dc5b1030cf769e06d1260c70320fc877e SHA256 c0821534a8510982d26b3085b148d9091dede53780733515eb49c99a65da293a
@@ -15,13 +13,6 @@ DIST libsndfile-1.0.19.tar.gz 924368 RMD160 027d53e55b6d01c78aba31ed239fd2f0d2f7
 EBUILD libsndfile-1.0.17-r1.ebuild 1614 RMD160 02a0f9050be249145714773d95aeae75721db0b9 SHA1 c2caef7702b811224de8c58950b767eb7b37e6a7 SHA256 d9d951253ab1f0204cf5d5462df7e01b9c89a25744251abf4ba6c971c9291909
 EBUILD libsndfile-1.0.18-r1.ebuild 1827 RMD160 ec2716527c9cb159452990d32e80e850b5d5ba00 SHA1 b49ecedfc2cba7f7c2240b09a333b260b59c6aed SHA256 79cea109ae1b6e4f2de60328cd7a6b0a12cda0f0d414c3abcf7028aad2bbce66
 EBUILD libsndfile-1.0.18.ebuild 1756 RMD160 9b317138530e3bfd95e6f60bfcd87bd3f2d989d5 SHA1 248b160b66fff9603e1dcbe5bb3b1c1e7837c75b SHA256 f7b63efc00bc722969a53d1ad15eac078e79afb7a2cd2d698e605d5ed71df088
-EBUILD libsndfile-1.0.19.ebuild 1763 RMD160 17c5f12b021f1876304144adca5859275cb41290 SHA1 be743ef5898e27c6bacb53038acbefc42265b0d4 SHA256 16c6e039d5b9299bc19102b102cfe17efadd08b966e053ca7250796bae7427ee
-MISC ChangeLog 14128 RMD160 a0b470e091d75e9ac6983cb80aa0d2e857c4805b SHA1 d5e0358f9571302095565a6ea9e48fc4a54b7889 SHA256 74e5187c07fb292543a2d58827c04620a04181708386390d30c18d3e6d40d935
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknmOWMACgkQkKaRLQcq0GI6jwCePbmCtQU3Yuhid58fO9WGUKpL
-UaAAn1Uc7MyLf+e6pumvg8ok2M9lrZjV
-=q3yR
------END PGP SIGNATURE-----
+EBUILD libsndfile-1.0.19.ebuild 1835 RMD160 e44246803ff0b49d86189d334d1f1abac0a926b0 SHA1 9d3bddb94116b8ca42c2dbd01e7e3568738c7e04 SHA256 cb5a5bc698b85fa7befa4837436b978c9ab47be8ba6fdbf476022a6fe0fef14e
+MISC ChangeLog 14374 RMD160 9495a908e5ddb4ff144ff395c5e2e1461053a499 SHA1 f148e9730809ff5ac06fdaf4112dbd1f14cded82 SHA256 13879bf603ba94bcb2200f0b1e8ec1198c2feb625ef259d589ee20eb42be8f74
+MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.19-automagic_jack.patch b/media-libs/libsndfile/files/libsndfile-1.0.19-automagic_jack.patch
new file mode 100644
index 000000000000..caa5566b80b4
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.19-automagic_jack.patch
@@ -0,0 +1,25 @@
+diff -ur libsndfile-1.0.19.orig/configure.ac libsndfile-1.0.19/configure.ac
+--- libsndfile-1.0.19.orig/configure.ac	2009-03-03 00:37:24.000000000 +0200
++++ libsndfile-1.0.19/configure.ac	2009-05-08 14:43:11.000000000 +0300
+@@ -124,6 +124,9 @@
+ AC_ARG_ENABLE(alsa,
+ 	AC_HELP_STRING([--disable-alsa], [disable use of ALSA]))
+ 
++AC_ARG_ENABLE(jack,
++	AC_HELP_STRING([--disable-jack], [disable use of JACK]))
++
+ AC_ARG_ENABLE(external-libs,
+ 	AC_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis]))
+ 
+@@ -342,7 +345,10 @@
+ #====================================================================================
+ # Check for JACK (only used for examples/sndfile-jackplay).
+ 
+-PKG_CHECK_MOD_VERSION(JACK, jack >= 0.100, ac_cv_jack=yes, ac_cv_jack=no)
++ac_cv_jack=no
++if test x$enable_jack != xno ; then
++	PKG_CHECK_MOD_VERSION(JACK, jack >= 0.100, ac_cv_jack=yes, ac_cv_jack=no)
++	fi
+ 
+ if test x$ac_cv_jack = "xyes" ; then
+ 	HAVE_JACK=1
diff --git a/media-libs/libsndfile/libsndfile-1.0.19.ebuild b/media-libs/libsndfile/libsndfile-1.0.19.ebuild
index 01c5c6f7b76b..feff90805200 100644
--- a/media-libs/libsndfile/libsndfile-1.0.19.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.19.ebuild,v 1.8 2009/04/15 19:45:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.19.ebuild,v 1.9 2009/05/08 11:54:15 ssuominen Exp $
 
 inherit eutils libtool autotools
 
@@ -17,13 +17,14 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="sqlite alsa minimal"
+IUSE="alsa jack minimal sqlite"
 
 RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
 		>=media-libs/libogg-1.1.3
 		>=media-libs/libvorbis-1.2.1_rc1 )
 	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
+	sqlite? ( >=dev-db/sqlite-3.2 )
+	jack? ( media-sound/jack-audio-connection-kit )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -32,11 +33,13 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	sed -i -e "s/noinst_PROGRAMS/check_PROGRAMS/" "${S}/tests/Makefile.am" \
-	"${S}/examples/Makefile.am" || die "failed to remove forced build of test and example programs"
-	epatch "${FILESDIR}/${PN}-1.0.17-regtests-need-sqlite.patch"
-	epatch "${FILESDIR}/${PN}-1.0.18-less_strict_tests.patch"
+		"${S}/examples/Makefile.am" || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch \
+		"${FILESDIR}"/${PN}-1.0.18-less_strict_tests.patch \
+		"${FILESDIR}"/${P}-automagic_jack.patch
+
 	rm M4/libtool.m4 M4/lt*.m4 || die "rm failed"
 
 	AT_M4DIR=M4 eautoreconf
@@ -46,15 +49,16 @@ src_unpack() {
 src_compile() {
 	econf $(use_enable sqlite) \
 		$(use_enable alsa) \
+		$(use_enable jack) \
 		$(use_enable !minimal external-libs) \
 		--disable-octave \
 		--disable-gcc-werror \
 		--disable-gcc-pipe \
 		--disable-dependency-tracking
-	emake || die "emake failed."
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed."
+	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-libs/libsndfile/metadata.xml b/media-libs/libsndfile/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-libs/libsndfile/metadata.xml
+++ b/media-libs/libsndfile/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>