[gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/

[Miroslav Šulc]

commit:     27a8275181331b1cd6f078d68dc52dc43fc74ccb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 15:16:09 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 15:16:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a82751

media-sound/jalv: removed old 1.6.0-r2

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/jalv/Manifest                        |  1 -
 media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch | 31 -----------
 media-sound/jalv/files/jalv-1.6.0-stdin.patch    | 67 ------------------------
 media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch | 34 ------------
 media-sound/jalv/jalv-1.6.0-r2.ebuild            | 60 ---------------------
 5 files changed, 193 deletions(-)

diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index b474faaebf8..f4923219b7a 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,2 +1 @@
-DIST jalv-1.6.0.tar.bz2 157726 BLAKE2B d1d35ccc3c0234d0005b83fca89ba0570f747f65568da6b5ea4ef0a0974bbd729540555e3cdcd77f3f5b7a8de9f987c7743e258d7544c8d70c7c51aaae84f9a5 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3
 DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b

diff --git a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
deleted file mode 100644
index f6ca944b04c..00000000000
--- a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c32f3ca76a09c03fe9a022eb46e049e6fd5e2dbb Mon Sep 17 00:00:00 2001
-From: David Robillard <d@××××××××.net>
-Date: Sat, 7 Jan 2017 19:20:55 -0500
-Subject: Fix compilation with newer versions of Qt5
-
-
-diff --git a/wscript b/wscript
-index 24f5a2b..08df946 100644
---- a/wscript
-+++ b/wscript
-@@ -5,7 +5,7 @@ from waflib.extras import autowaf as autowaf
- import waflib.Options as Options
- 
- # Version of this package (even if built as a child)
--JALV_VERSION = '1.6.0'
-+JALV_VERSION = '1.6.1'
- 
- # Variables for 'waf dist'
- APPNAME = 'jalv'
-@@ -231,7 +231,7 @@ def build(bld):
-                   includes     = ['.', 'src'],
-                   lib          = ['pthread'],
-                   install_path = '${BINDIR}',
--                  cxxflags     = ['-fPIC'])
-+                  cxxflags     = ['-fPIC', '-std=c++11'])
-         autowaf.use_lib(bld, obj, libs + ' QT5')
- 
-     # Man pages
--- 
-cgit v0.10.2
-

diff --git a/media-sound/jalv/files/jalv-1.6.0-stdin.patch b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
deleted file mode 100644
index 953af7c5f3e..00000000000
--- a/media-sound/jalv/files/jalv-1.6.0-stdin.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 3a46e861b5b8dbbacb8dd1cec9fa2c69a10b26e0 Mon Sep 17 00:00:00 2001
-From: David Robillard <d@××××××××.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
deleted file mode 100644
index a57447ce075..00000000000
--- a/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4d22c6a53ff1dcb657ab1913f1b100e42db19bca Mon Sep 17 00:00:00 2001
-From: David Robillard <d@××××××××.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
deleted file mode 100644
index a2fdff30c7c..00000000000
--- a/media-sound/jalv/jalv-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-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.10.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)
-}