Fix jack support.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 51 insertions, 12 deletions

diff --git a/media-sound/lingot/ChangeLog b/media-sound/lingot/ChangeLog
index 2d88ea973147..a2dcf2b3e832 100644
--- a/media-sound/lingot/ChangeLog
+++ b/media-sound/lingot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lingot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lingot/ChangeLog,v 1.8 2011/06/11 21:26:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lingot/ChangeLog,v 1.9 2011/06/12 08:48:42 radhermit Exp $
+
+  12 Jun 2011; Tim Harder <radhermit@gentoo.org> lingot-0.9.0.ebuild,
+  +files/lingot-0.9.0-jack.patch:
+  Fix jack support.
 
   11 Jun 2011; Tim Harder <radhermit@gentoo.org> lingot-0.9.0.ebuild:
   Fix dependencies.
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 237ed7cc1fba..62231c1b6710 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -3,22 +3,23 @@ Hash: SHA1
 
 AUX lingot-0.7.6-clean-install.patch 527 RMD160 df2700df4055cef8563d7b1a621dce93ca8c5174 SHA1 ad5342d7b1db69cb1f06d17b571bc02875b75d9a SHA256 6dbd67dfea0e0f3b493884ca8f39df90f025d79d24bf4c0149bc8a8bfece54a6
 AUX lingot-0.7.6-memory_leak.patch 1231 RMD160 3b0c4f4d67575df16c0c5239f692f25445f02c01 SHA1 bd0397efcb3f32fd4d3fb8bd3547ef29c117ed7e SHA256 e530e2549712c0eeafe0240ca8b347197a082a3eb9f48740533cef58dba54bef
+AUX lingot-0.9.0-jack.patch 861 RMD160 10d08a8ee97e9640d19dc6666de3a63424eee75c SHA1 29c612bbb49ec13c77d557957093f5bc45b55361 SHA256 5005e72cdf0af35e45b82d720b5a42feba9ce1c201f2bcc1a42f13250271806b
 DIST lingot-0.7.6.tar.gz 421899 RMD160 cbb9617752a59ec617664be3496a905d1ea7abcf SHA1 7e0eb3d28f59c3ef9fcdaf47503747ce5029732d SHA256 0fe863b4f02d94809f27afe846a617db3f665c7088cac61a3304a5ea897747b2
 DIST lingot-0.8.1.tar.gz 388403 RMD160 16458de9ec7bc1143c346faccfbdf53f3f08d75d SHA1 7d68edf022a4c45d4ded8b10de9b7477182a5c17 SHA256 7fb17cf8ae753ee8db0a22d25c3feed0024c6ecc336454fc1ac47eec5473f53e
 DIST lingot-0.9.0.tar.gz 420806 RMD160 29cdb4c6afffe389a89cac9647918af76b09915c SHA1 b183cffc1bfda66257595c416e4cd07dbda38ed7 SHA256 ab1fc0cc45e03da6d7c92711bbd8e1691816c2e209108c80f99a54746912e11f
 EBUILD lingot-0.7.6.ebuild 908 RMD160 235025f6d9dcfbd578ac0616bd0098568dc71c32 SHA1 a75669b60ece51c2ca5c35863df7efe1ed40e67d SHA256 3cb1752265f13dd5038fa16e571475685392933272f4b8dbb934914f53e251fb
 EBUILD lingot-0.8.1.ebuild 1002 RMD160 542ec469ba698824ad559798ead69c7a5565e295 SHA1 710946635c1c56b34f75453bd0b7d1e76a258a25 SHA256 972b9aa717abbd53fcef40e622a320b3904a678bb67b45285ad0dcf3c77f8640
-EBUILD lingot-0.9.0.ebuild 1000 RMD160 d0b0a4d1e98ce315258014ac86886b72d961db46 SHA1 2277a9fe0d50fc5957f6419a83cc5055444ea60e SHA256 eab4e878e9dfc7c695eee07e89e50bc88b92b585cc296ec09dde548e61d45f38
-MISC ChangeLog 1181 RMD160 f73b83cd27353a55431d5973d287b4ad8235107b SHA1 c4528f831b6e0f8912e5587b06ca24c049fb94fc SHA256 467b72fcb71acdc574f8fe02d6e03cac17d59a908a616e8d675ae6de880a6247
+EBUILD lingot-0.9.0.ebuild 1035 RMD160 f73f86768326d116416f9e53eae50b86c2354ca2 SHA1 ef83ecabe3bd91455b2e3d2d8b3c87588a56f091 SHA256 75f89e99b41c6e9c69d5bb69c7dfb78a9220215219db7ed92dc49c72600e6b41
+MISC ChangeLog 1306 RMD160 dbfc1cb88d89240951ab4c62f8b4e29791f83f04 SHA1 ae0e56672b95832d5924bbb51a8aec180c57ff80 SHA256 3606e2a58ea5d1cfdd85c3de459349a4fb2bdc16f1701497cf397354d2855096
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN892pAAoJEEqz6FtPBkyjfI4H/jcGXToMkBLt26dQXfs4j/MS
-PNmTDqr2xeOlsMS2SGD8yEur5eB7ySjNvetlrlLIPJSFwlhas/ZdmCO3eLiNvZJC
-SdtrCUU9aLlCCIhloOHT25MYZlkb8ah6GY9jSaU8GE7+47O8eTvrolnky64KFgDY
-15DI1jP6RobanMXEo2dkbbSvSy8hLJGJ3gc1D4hvZaCveRrEBxiTNcPuebkRvKtG
-rg6+Df+Ao1Me5KVRRlwvvTHZSQyYunI95Kd0UTtww/vwjKBNO2dkXL690qR8+Y42
-CazhmWpVKJTrPmliVl6gKToiGT+I0K2oW9fi1vxo9edjTCKh+VvECgLiJK4/2SA=
-=z6PJ
+iQEcBAEBAgAGBQJN9H12AAoJEEqz6FtPBkyjHDEH/j9ZtVentPh9WxeT6UPb8c02
+T0WWWAYFMaDNBy9NXfZLeZDYrCpYKvfP5r0WA5atTgnw0GMyfux9j6YpBQ79Tw6z
+iAIivK/NXqWJizL+gNkCdSKtfQ4MPNnhui39VpyND+tS7JxN3kyhjah6phTjxNN1
+s3x19/m5hYP5oFEVAT7Gp//NVfvzZJWmBZUctWuWLAxOslZQZX+/paBJo1iCW/jg
+fi/Tq86XSwvwwKmlTKpqYiExh56z8HTMBsaESVYpD2OOWTjelYFCsOZKdX8yKd82
+F35I+Xm+mVfHnnuxzGp2kkSGpuSMONQJJTYW0FEOP0A7ggw4jTQwsWfnxIVOH6Q=
+=ELla
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lingot/files/lingot-0.9.0-jack.patch b/media-sound/lingot/files/lingot-0.9.0-jack.patch
new file mode 100644
index 000000000000..c7885a4098e0
--- /dev/null
+++ b/media-sound/lingot/files/lingot-0.9.0-jack.patch
@@ -0,0 +1,32 @@
+--- a/src/lingot-audio-jack.c
++++ b/src/lingot-audio-jack.c
+@@ -177,7 +177,7 @@
+ 	const char **ports = NULL;
+ 	const char* exception;
+ 
+-	unsigned long int flags = JackPortIsActive | JackPortIsOutput;
++	unsigned long int flags = JackPortIsOutput;
+ 
+ 	try {
+ 		if (client != NULL) {
+@@ -265,8 +265,9 @@
+ 			throw(_("Cannot activate client"));
+ 		}
+ 
+-		ports = jack_get_ports(audio->jack_client, NULL, NULL, JackPortIsActive
+-				| JackPortIsOutput);
++		ports
++				= jack_get_ports(audio->jack_client, NULL, NULL,
++						JackPortIsOutput);
+ 		if (ports == NULL) {
+ 			throw(_("No active capture ports"));
+ 		}
+@@ -321,7 +322,7 @@
+ #	ifdef JACK
+ 	//jack_cycle_wait(audio->jack_client);
+ 	const char** ports = jack_get_ports(audio->jack_client, NULL, NULL,
+-			JackPortIsActive | JackPortIsOutput);
++			JackPortIsOutput);
+ 
+ 	if (ports != NULL) {
+ 		int i, j = 0;
diff --git a/media-sound/lingot/lingot-0.9.0.ebuild b/media-sound/lingot/lingot-0.9.0.ebuild
index 5d5cb79de6af..babd0dbd209d 100644
--- a/media-sound/lingot/lingot-0.9.0.ebuild
+++ b/media-sound/lingot/lingot-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lingot/lingot-0.9.0.ebuild,v 1.2 2011/06/11 21:26:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lingot/lingot-0.9.0.ebuild,v 1.3 2011/06/12 08:48:42 radhermit Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -27,7 +27,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.6-clean-install.patch
+	epatch "${FILESDIR}"/${PN}-0.7.6-clean-install.patch \
+		"${FILESDIR}"/${P}-jack.patch
+
 	eautoreconf
 }