gentoo resync : 31.10.2017

4 files changed, 164 insertions, 0 deletions

diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 1af1514ac570..c3706e945a7a 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,6 +1,9 @@
 AUX jalv-1.6.0-qt-5.7.0.patch 906 SHA256 373cea63c28d179275da656a0ab09638eeafd0dd269e11185b668c2395af5f2f SHA512 b5ddc63afc7340a0d2d14bd924c7adc1393d469031c3d1c37210e21090b1159c2fd3879e627f8c8e611452d9ade40a9fe18de9e63880bdbd2f05caf96209b163 WHIRLPOOL 2ee62871c06e519cd0486802585974b67a34da22b4e8e42c14dfb69744b9d83484e7be323332bb5a5ff25ee3e465c36b82cb3ab3c664fc8cbcb27c1fcd579038
+AUX jalv-1.6.0-stdin.patch 2008 SHA256 f030f205c8d047e49f460a965c59e721f48f2aa7f39037da75c484b9037df079 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd WHIRLPOOL 5e19a657f45093bb4d3965423bd46b9c0b168746d84c7d1e010f56a3a56f2a130e1015b191339a89c1656470616904910aeb10f6bba1511629f88ac2efe51e90
+AUX jalv-1.6.0-suil-qt5.patch 1159 SHA256 2118898fba87e7723b94039dffc7cc05889b123059533b33f9ebe196e7897f9e SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2 WHIRLPOOL 577cfcb50cd07d812749c780881e29b5001186913d3a797491bc048c9d05d6193be41648ccb60ad9787b280987ea7eb05baed44420c3099e17ddb41215d32dd1
 DIST jalv-1.6.0.tar.bz2 157726 SHA256 914625972bb2e99552a0bb0ae3b5d27f70901b92fab1f6daf8fb31d1ffbf5cf4 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3 WHIRLPOOL 67cf715624a0355f1e3927fb9a9a97ea1375069b24c9445c2fecf8c11611a1d884c58ed10134784f6d093fc52181aacdbefb13314d5713ddee032287215573e4
 EBUILD jalv-1.6.0-r1.ebuild 1362 SHA256 a2f9f0a2cb04d6c7f429f56915d9b081cecdb00ec2a40b70d821b013f135b4ec SHA512 12f810c07ed4a7090cfee9dc46d1439595d5b4d9dc194547cf5d4367052ca9a4e2cc043bd062e6e6482dec11fdd17acbbc20c12f08d9c534c4514d93327bf84b WHIRLPOOL 85eac427b90c29c2357ed7f6d0feeccb8aed9dcdd99584f58a42ea797d4f8ad33b702fffe1df959fd3505aa9a8d0719059f6909eddcbe83557faac452e209180
+EBUILD jalv-1.6.0-r2.ebuild 1432 SHA256 556829671eba5527c05f322d0dcdc48743c036f104999af91a8f9f4efda6dbec SHA512 0732bd0f8bca66e5e82736c8d927357795bc7ab779b80f6afbaf712ee69b4602061a87e9cbfc66851921c31c59a5506a51130db25ef4303f2edf55b3578a5900 WHIRLPOOL 87f9386d0102398f296fa564482aa85fff47a52b9af52c72226a2e2ed06036d3b1472b0c4d50cd12d0f0b8f8e85c817bb6414566dee02bbc4eef76cb4a584ea8
 MISC ChangeLog 2912 SHA256 2e9e873c8acaa7d398014d313055e8dfb2d163d6638612771df93d117d32059f SHA512 c2eb731679dc68d2587ffc6732c9f221ba0d2710970f6e7a9566d382cbd0a16cd58b5252c97202a1b93b032ee35335953f4976c08ece478deaea6152723c378e WHIRLPOOL dfbbbd1fdf558d52c4bd71ded52017939d5dfe063db7b437343322168ddf94727236d79e1e8b561a62800b5a2f75b547b13983f9bc82d9235301b1f047078822
 MISC ChangeLog-2015 1273 SHA256 bfbb0dfb9135a46c1bfb1262faf8de7c63d16445792a895bbb9fb1589b55a53c SHA512 9f5e354d1518a587813a462934588ed815ce078bb622ac12bd14f1d5fc8fd87d85eb7990f4b4146836b4e27fd476d67f0d1a020ac6c2d78758026ee5382676fd WHIRLPOOL 657b1d73c4d13a3b835768ec45616d0fc37961036cd7163938aed28b3703f2716a52a779bb35abb4c65f6dc56c52e1ff5e97002af88cb0faf72352fd1dbb68ed
 MISC metadata.xml 1152 SHA256 805b70351efb25fb21883f4a0f428027c69e73f9ef468d47c884c9f3b8c1f481 SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c WHIRLPOOL cccdfd5fb5b8277e3ca8de981cd899deff7780fc7ec10e6636bae9405594b4cf938ba441010dcdd66358f000fea4fa1764f3d337f3dfd3bd5b06758eeb5bf978
diff --git a/media-sound/jalv/files/jalv-1.6.0-stdin.patch b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
new file mode 100644
index 000000000000..953af7c5f3e3
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
@@ -0,0 +1,67 @@
+From 3a46e861b5b8dbbacb8dd1cec9fa2c69a10b26e0 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 18 Feb 2017 18:00:03 +0100
+Subject: Add jalv -i option to ignore stdin for background use
+
+
+diff --git a/doc/jalv.1 b/doc/jalv.1
+index 6d93a72..000ed5a 100644
+--- a/doc/jalv.1
++++ b/doc/jalv.1
+@@ -17,6 +17,10 @@ Print the command line options.
+ Print control output changes to stdout.
+ 
+ .TP
++\fB\-i\fR
++Ignore input on stdin (for background use).
++
++.TP
+ \fB\-c SYM=VAL\fR
+ Set control value (e.g. "vol=1.4").
+ 
+diff --git a/src/jalv_console.c b/src/jalv_console.c
+index c0f369c..e0e114b 100644
+--- a/src/jalv_console.c
++++ b/src/jalv_console.c
+@@ -106,6 +106,8 @@ jalv_init(int* argc, char*** argv, JalvOptions* opts)
+ 				opts->controls, (++n_controls + 1) * sizeof(char*));
+ 			opts->controls[n_controls - 1] = (*argv)[a];
+ 			opts->controls[n_controls]     = NULL;
++		} else if ((*argv)[a][1] == 'i') {
++			opts->non_interactive = true;
+ 		} else if ((*argv)[a][1] == 'd') {
+ 			opts->dump = true;
+ 		} else if ((*argv)[a][1] == 't') {
+@@ -191,7 +193,7 @@ jalv_open_ui(Jalv* jalv)
+ 
+ 		show_iface->hide(suil_instance_get_handle(jalv->ui_instance));
+ 
+-	} else {
++	} else if (!jalv->opts.non_interactive) {
+ 		// Primitive command prompt for setting control values
+ 		while (!zix_sem_try_wait(jalv->done)) {
+ 			char line[128];
+@@ -202,6 +204,8 @@ jalv_open_ui(Jalv* jalv)
+ 				break;
+ 			}
+ 		}
++	} else {
++		zix_sem_wait(jalv->done);
+ 	}
+ 
+ 	// Caller waits on the done sem, so increment it again to exit
+diff --git a/src/jalv_internal.h b/src/jalv_internal.h
+index 3a565ec..06f116a 100644
+--- a/src/jalv_internal.h
++++ b/src/jalv_internal.h
+@@ -172,6 +172,7 @@ typedef struct {
+ 	int      no_menu;           ///< Hide menu iff true
+ 	int      show_ui;           ///< Show non-embedded UI
+ 	int      print_controls;    ///< Print control changes to stdout
++	int      non_interactive;   ///< Do not listen for commands on stdin
+ } JalvOptions;
+ 
+ typedef struct {
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch b/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
new file mode 100644
index 000000000000..a57447ce075b
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
@@ -0,0 +1,34 @@
+From 4d22c6a53ff1dcb657ab1913f1b100e42db19bca Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 18 Mar 2017 12:00:11 +0100
+Subject: Use new suil init API to fix Qt5 plugin UIs
+
+
+diff --git a/src/jalv.c b/src/jalv.c
+index 78901ca..20f24e7 100644
+--- a/src/jalv.c
++++ b/src/jalv.c
+@@ -777,6 +777,7 @@ main(int argc, char** argv)
+ 	jalv.bpm           = 120.0f;
+ 	jalv.control_in    = (uint32_t)-1;
+ 
++	suil_init(&argc, &argv, SUIL_ARG_NONE);
+ 	if (jalv_init(&argc, &argv, &jalv.opts)) {
+ 		return EXIT_FAILURE;
+ 	}
+diff --git a/wscript b/wscript
+index 19f51bb..e2adc63 100644
+--- a/wscript
++++ b/wscript
+@@ -59,7 +59,7 @@ def configure(conf):
+     autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+                       atleast_version='0.12.0', mandatory=True)
+     autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+-                      atleast_version='0.6.0', mandatory=True)
++                      atleast_version='0.8.7', mandatory=True)
+     autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
+                       atleast_version='0.6.0', mandatory=True)
+     if Options.options.portaudio:
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/jalv-1.6.0-r2.ebuild b/media-sound/jalv/jalv-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..eb91d17f85f4
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 qmake-utils waf-utils
+
+DESCRIPTION="Simple but fully featured LV2 host for Jack"
+HOMEPAGE="http://drobilla.net/software/jalv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk gtk2 gtkmm portaudio qt5"
+
+RDEPEND="
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/lilv-0.24.0
+	>=media-libs/lv2-1.6.0
+	>=media-libs/sratom-0.6.0
+	>=media-libs/suil-0.6.0
+	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
+	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
+	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
+	portaudio? ( media-libs/portaudio )
+	!portaudio? ( virtual/jack )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.7.0.patch"
+	"${FILESDIR}/${P}-stdin.patch"
+	"${FILESDIR}/${P}-suil-qt5.patch"
+)
+
+src_configure() {
+	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(use qt5       || echo --no-qt5)       \
+		$(use gtk       || echo --no-gtk3)      \
+		$(use gtk2      || echo --no-gtk2)      \
+		$(use gtkmm     || echo --no-gtkmm)     \
+		$(use portaudio && echo --portaudio)
+}