* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2017-10-29 13:00 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-10-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 257d344317af170a10a0b7e5b49018704bb2a592
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 11:56:23 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 12:59:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257d3443
media-sound/jalv: Fix segfault w/ Qt5 plugins, run in background
Gentoo-bug: 621708, 634030
Closes: https://bugs.gentoo.org/634030
Package-Manager: Portage-2.3.13, Repoman-2.3.4
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 | 59 +++++++++++++++++++++
3 files changed, 160 insertions(+)
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 00000000000..953af7c5f3e
--- /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 00000000000..a57447ce075
--- /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 00000000000..03cdffb688e
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.0-r2.ebuild
@@ -0,0 +1,59 @@
+# 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=">=media-libs/lv2-1.6.0
+ >=media-libs/lilv-0.24.0
+ >=dev-libs/serd-0.14.0
+ >=dev-libs/sord-0.12.0
+ >=media-libs/suil-0.6.0
+ >=media-libs/sratom-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)
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2020-01-23 15:16 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2020-01-23 15:16 UTC (permalink / raw
To: gentoo-commits
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@drobilla.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@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
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@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
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)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2021-02-08 8:59 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-02-08 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 44275d01ee6eddbe7f0ae824c0998fd8b598839e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 08:59:16 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 08:59:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44275d01
media-sound/jalv: resolved missing include in 1.6.6 when gui disabled
Closes: https://bugs.gentoo.org/764473
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/jalv/files/jalv-1.6.6-suil-always.patch | 14 ++++++++++++++
media-sound/jalv/jalv-1.6.6.ebuild | 4 ++++
2 files changed, 18 insertions(+)
diff --git a/media-sound/jalv/files/jalv-1.6.6-suil-always.patch b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
new file mode 100644
index 00000000000..938f34ee055
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
@@ -0,0 +1,14 @@
+diff --git a/wscript b/wscript
+index 06f74f2..a269b14 100644
+--- a/wscript
++++ b/wscript
+@@ -170,8 +170,7 @@ def configure(conf):
+ conf.env.HAVE_QT4 or
+ conf.env.HAVE_QT5)
+
+- if have_gui:
+- conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
++ conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
+
+ if conf.env.HAVE_JACK:
+ conf.check_function(
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 17bf69398ae..cbef73cf0fa 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
"
DOCS=( AUTHORS NEWS README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-suil-always.patch"
+)
+
src_configure() {
use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
waf-utils_src_configure \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2021-02-09 10:11 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-02-09 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 0fa1aa04df444a4faf52c1212ecbe8f7a9568da6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 10:10:58 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 10:10:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa1aa04
media-sound/jalv: removed obsolete 1.6.4
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/jalv/Manifest | 1 -
media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch | 13 ------
media-sound/jalv/jalv-1.6.4.ebuild | 54 ------------------------
3 files changed, 68 deletions(-)
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 17894b5c515..d9510560e9b 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,2 +1 @@
-DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
diff --git a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
deleted file mode 100644
index 1f9b6147a21..00000000000
--- a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wscript b/wscript
-index af363ca..5060b4d 100644
---- a/wscript
-+++ b/wscript
-@@ -235,7 +235,7 @@ def build(bld):
- lib = ['pthread'],
- uselib = libs + ' QT5',
- install_path = '${BINDIR}',
-- cxxflags = ['-fPIC'])
-+ cxxflags = ['-fPIC', '-std=c++11'])
-
- # Man pages
- bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
deleted file mode 100644
index 1480850cf37..00000000000
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 gtkmm portaudio qt5"
-
-RDEPEND="
- >=dev-libs/serd-0.24.0
- >=dev-libs/sord-0.14.0
- >=media-libs/lilv-0.24.0
- >=media-libs/lv2-1.16.0
- >=media-libs/sratom-0.6.0
- >=media-libs/suil-0.10.0
- gtk? ( >=x11-libs/gtk+-3.0.0:3 )
- 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}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.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 gtkmm || echo --no-gtkmm) \
- $(use portaudio && echo --portaudio)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2022-10-02 9:06 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2022-10-02 9:06 UTC (permalink / raw
To: gentoo-commits
commit: 06d5a2d20d05d3391ab67253c65686dcef783078
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 09:06:24 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 09:06:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d5a2d2
media-sound/jalv: bump to 1.6.8
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/jalv/Manifest | 1 +
media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch | 15 ++++++
media-sound/jalv/jalv-1.6.8.ebuild | 59 ++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index d9510560e9bc..e9acb899f2de 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1 +1,2 @@
DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
+DIST jalv-1.6.8.tar.xz 60712 BLAKE2B d2264163821273bf40795d4dbfc1905c6ab334449461e311a18a6f667abafb92ed12afa8e9315bcf8d3f7bd3bde3a765994add294e5037b06349157f8b0bd734 SHA512 a3361239cbff8b02a0d46bb06480d727ad45abe1856ad4cec1a1299851392be04fdfa58ba6803ed2a446eb8964c4a44191733b53fe8529c65155b0221323428f
diff --git a/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch b/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch
new file mode 100644
index 000000000000..3b0e3008662e
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.8-qt5-fPIC.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 9ebc14f..25e3704 100644
+--- a/meson.build
++++ b/meson.build
+@@ -344,8 +344,8 @@ if not get_option('qt5').disabled()
+ executable(
+ 'jalv.qt5',
+ sources + files('src/jalv_qt.cpp') + [jalv_qt5_meta_cpp],
+- c_args: c_suppressions + platform_defines + suil_defines,
+- cpp_args: cpp_suppressions + platform_defines + suil_defines,
++ c_args: c_suppressions + platform_defines + suil_defines + '-fPIC',
++ cpp_args: cpp_suppressions + platform_defines + suil_defines + '-fPIC',
+ dependencies: common_dependencies + [qt5_dep, suil_dep],
+ include_directories: include_directories('src'),
+ install: true,
diff --git a/media-sound/jalv/jalv-1.6.8.ebuild b/media-sound/jalv/jalv-1.6.8.ebuild
new file mode 100644
index 000000000000..010f8cf631b9
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson qmake-utils flag-o-matic xdg
+
+DESCRIPTION="Simple but fully featured LV2 host for Jack"
+HOMEPAGE="https://drobilla.net/software/jalv.html"
+SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk jack portaudio qt5"
+
+RDEPEND="
+ dev-libs/serd
+ dev-libs/sord
+ media-libs/lilv
+ media-libs/lv2
+ media-libs/sratom
+ media-libs/suil
+ gtk? ( x11-libs/gtk+:3 )
+ jack? ( virtual/jack )
+ portaudio? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+ "${FILESDIR}/${P}-qt5-fPIC.patch"
+)
+
+src_configure() {
+ use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+
+ local emesonargs=(
+ $(meson_feature gtk gtk3)
+ $(meson_feature jack)
+ $(meson_feature portaudio)
+ $(meson_feature qt5)
+ )
+ meson_src_configure
+}
+
+src_compile() {
+ append-flags -fPIC
+
+ meson_src_compile
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/
@ 2022-11-04 7:17 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2022-11-04 7:17 UTC (permalink / raw
To: gentoo-commits
commit: c527724f1c9215fc67300183b1e51ee28701e84e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 07:17:19 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 07:17:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c527724f
media-sound/jalv: dropped obsolete 1.6.6
Bug: https://bugs.gentoo.org/879135
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/jalv/Manifest | 1 -
.../jalv/files/jalv-1.6.6-suil-always.patch | 14 ------
media-sound/jalv/jalv-1.6.6.ebuild | 56 ----------------------
media-sound/jalv/metadata.xml | 4 --
4 files changed, 75 deletions(-)
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index e9acb899f2de..8b9cbe97fb04 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,2 +1 @@
-DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
DIST jalv-1.6.8.tar.xz 60712 BLAKE2B d2264163821273bf40795d4dbfc1905c6ab334449461e311a18a6f667abafb92ed12afa8e9315bcf8d3f7bd3bde3a765994add294e5037b06349157f8b0bd734 SHA512 a3361239cbff8b02a0d46bb06480d727ad45abe1856ad4cec1a1299851392be04fdfa58ba6803ed2a446eb8964c4a44191733b53fe8529c65155b0221323428f
diff --git a/media-sound/jalv/files/jalv-1.6.6-suil-always.patch b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
deleted file mode 100644
index 938f34ee0556..000000000000
--- a/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/wscript b/wscript
-index 06f74f2..a269b14 100644
---- a/wscript
-+++ b/wscript
-@@ -170,8 +170,7 @@ def configure(conf):
- conf.env.HAVE_QT4 or
- conf.env.HAVE_QT5)
-
-- if have_gui:
-- conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
-+ conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
-
- if conf.env.HAVE_JACK:
- conf.check_function(
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
deleted file mode 100644
index 2a12a7a0924d..000000000000
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..11} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="https://drobilla.net/software/jalv.html"
-SRC_URI="https://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="gtk gtkmm portaudio qt5"
-
-RDEPEND="
- dev-libs/serd
- dev-libs/sord
- media-libs/lilv
- media-libs/lv2
- media-libs/sratom
- media-libs/suil
- gtk? ( x11-libs/gtk+:3 )
- gtkmm? ( dev-cpp/gtkmm:2.4 )
- portaudio? ( media-libs/portaudio )
- !portaudio? ( virtual/jack )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-suil-always.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 gtkmm || echo --no-gtkmm) \
- $(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
index 20fcbc0d82bf..1e376ed9229c 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/metadata.xml
@@ -14,8 +14,4 @@
To make it simple to test plugins in hosts that use different toolkits, there are several Jalv executables: jalv, jalv.gtk, jalv.gtkmm, and jalv.qt.
</longdescription>
-<use>
- <flag name="gtkmm"> Adds support for <pkg>dev-cpp/gtkmm</pkg>: C++ interface for GTK+2</flag>
-</use>
-
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-04 7:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-23 15:16 [gentoo-commits] repo/gentoo:master commit in: media-sound/jalv/, media-sound/jalv/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2022-11-04 7:17 Miroslav Šulc
2022-10-02 9:06 Miroslav Šulc
2021-02-09 10:11 Miroslav Šulc
2021-02-08 8:59 Miroslav Šulc
2017-10-29 13:00 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox