[gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2019-04-06 20:47 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-04-06 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     da177b66a409bd6be238fdfac3b676d580a0f130
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 20:42:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 20:46:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da177b66

media-plugins/calf: Fix build with >=fluidsynth-2

Reported-by: Anton Gubarkov <anton.gubarkov <AT> gmail.com>
Closes: https://bugs.gentoo.org/680128
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-plugins/calf/calf-0.90.1.ebuild              |  3 +-
 .../calf/files/calf-0.90.1-fluidsynth-2.patch      | 66 ++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/media-plugins/calf/calf-0.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
index 37fb836f5ee..24614bd103c 100644
--- a/media-plugins/calf/calf-0.90.1.ebuild
+++ b/media-plugins/calf/calf-0.90.1.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-no-automagic.patch"
 	"${FILESDIR}/${P}-htmldir.patch"
 	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-fluidsynth-2.patch"
 )
 
 src_prepare() {
@@ -72,5 +73,5 @@ src_configure() {
 src_install() {
 	default
 	mv "${ED}"/usr/share/bash-completion/completions/calf \
-		"${ED}"/usr/share/bash-completion/completions/calfjackhost
+		"${ED}"/usr/share/bash-completion/completions/calfjackhost || die
 }

diff --git a/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch b/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
new file mode 100644
index 00000000000..083b1e95d7d
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
@@ -0,0 +1,66 @@
+From bba03b6080dc198f3513b5c29fe1ba4ff9e4aa59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 10 Oct 2018 00:22:46 +0200
+Subject: [PATCH] fluidsynth: port to API for fluidsynth version > 2.0.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Build tested with fluidsynth 1.1.11 and 2.0.1
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/fluidsynth.cpp | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
+index c5d307d76..54023dc8b 100644
+--- a/src/fluidsynth.cpp
++++ b/src/fluidsynth.cpp
+@@ -74,6 +74,7 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
+         new_sfid = sid;
+ 
+         fluid_sfont_t* sfont = fluid_synth_get_sfont(s, 0);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+         soundfont_name = (*sfont->get_name)(sfont);
+ 
+         sfont->iteration_start(sfont);
+@@ -92,6 +93,26 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
+             if (first_preset == -1)
+                 first_preset = id;
+         }
++#else
++        soundfont_name = fluid_sfont_get_name(sfont);
++
++        fluid_sfont_iteration_start(sfont);
++
++        string preset_list;
++        fluid_preset_t* tmp;
++        int first_preset = -1;
++        while((tmp = fluid_sfont_iteration_next(sfont)))
++        {
++            string pname = fluid_preset_get_name(tmp);
++            int bank = fluid_preset_get_banknum(tmp);
++            int num = fluid_preset_get_num(tmp);
++            int id = num + 128 * bank;
++            sf_preset_names[id] = pname;
++            preset_list += calf_utils::i2s(id) + "\t" + pname + "\n";
++            if (first_preset == -1)
++                first_preset = id;
++        }
++#endif
+         if (first_preset != -1)
+         {
+             fluid_synth_bank_select(s, 0, first_preset >> 7);
+@@ -134,7 +155,11 @@ void fluidsynth_audio_module::update_preset_num(int channel)
+ {
+     fluid_preset_t *p = fluid_synth_get_channel_preset(synth, channel);
+     if (p)
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+         last_selected_presets[channel] = p->get_num(p) + 128 * p->get_banknum(p);
++#else
++        last_selected_presets[channel] = fluid_preset_get_num(p) + 128 * fluid_preset_get_banknum(p);
++#endif
+     else
+         last_selected_presets[channel] = -1;
+     status_serial++;


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2021-03-27  2:58 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-27  2:58 UTC (permalink / raw
  To: gentoo-commits

commit:     72bb48ebb72df803c96a77beb21463f7de2447f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 02:35:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 02:57:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72bb48eb

media-plugins/calf: fix build with slibtool

Thanks-to: orbea <orbea <AT> riseup.net>
Closes: https://bugs.gentoo.org/778314
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/calf/calf-0.90.3.ebuild              |   1 +
 .../calf/files/calf-0.90.3-slibtool.patch          | 118 +++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3.ebuild
index c459fd25c34..ca5c968e7df 100644
--- a/media-plugins/calf/calf-0.90.3.ebuild
+++ b/media-plugins/calf/calf-0.90.3.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.90.3-slibtool.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/files/calf-0.90.3-slibtool.patch b/media-plugins/calf/files/calf-0.90.3-slibtool.patch
new file mode 100644
index 00000000000..35a4c4ee941
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.3-slibtool.patch
@@ -0,0 +1,118 @@
+https://github.com/calf-studio-gear/calf/pull/288
+https://bugs.gentoo.org/778314
+
+From d18a873ebc92bd1eee2b3f61b7768a195fe6906a Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 26 Mar 2021 17:47:11 -0700
+Subject: [PATCH 1/2] build: Use canonical libtool library names.
+
+---
+ src/Makefile.am | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dd6bb8aa0..66119b4d1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@ bin_PROGRAMS =
+ noinst_LTLIBRARIES =
+ 
+ noinst_PROGRAMS = calfbenchmark
+-pkglib_LTLIBRARIES = calf.la
++pkglib_LTLIBRARIES = libcalf.la
+ 
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
+ # TODO: Remove -finline flags is clang is used
+@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
+ noinst_LTLIBRARIES += libcalfgui.la
+ bin_PROGRAMS += calfjackhost 
+ calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp
+-calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
++calfjackhost_LDADD = libcalfgui.la libcalf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
+ if USE_LASH
+ AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
+ calfjackhost_LDADD += $(LASH_DEPS_LIBS)
+@@ -32,31 +32,31 @@ endif
+ AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
+ noinst_PROGRAMS += calfmakerdf
+ calfmakerdf_SOURCES = makerdf.cpp
+-calfmakerdf_LDADD = calf.la
++calfmakerdf_LDADD = libcalf.la
+ 
+ calfbenchmark_SOURCES = benchmark.cpp
+-calfbenchmark_LDADD = calf.la
++calfbenchmark_LDADD = libcalf.la
+ 
+-calf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
+-calf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS) 
++libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
++libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
+ if USE_DEBUG
+-calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
++libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ else
+-calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
++libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
+ endif
+ 
+ if USE_LV2_GUI
+ 
+ # Version WITH out-of-process GUI - links GTK+, UI controls etc.
+ 
+-noinst_LTLIBRARIES += calflv2gui.la
++noinst_LTLIBRARIES += libcalflv2gui.la
+ 
+-calflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
++libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
+ 
+ if USE_DEBUG
+-calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
++libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+ else
+-calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
++libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+ endif
+ 
+ endif
+
+From 75f33e02d3c9d0acf2bee59fd286cbc98f0d3d67 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 26 Mar 2021 17:47:39 -0700
+Subject: [PATCH 2/2] build: Use libtool to isntall libtool libraries.
+
+---
+ src/Makefile.am | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 66119b4d1..93361aaad 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,7 +49,8 @@ if USE_LV2_GUI
+ 
+ # Version WITH out-of-process GUI - links GTK+, UI controls etc.
+ 
+-noinst_LTLIBRARIES += libcalflv2gui.la
++if USE_LV2_GUI
++pkglib_LTLIBRARIES += libcalflv2gui.la
+ 
+ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
+ 
+@@ -58,6 +59,7 @@ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI
+ else
+ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+ endif
++endif
+ 
+ endif
+ 
+@@ -78,9 +80,6 @@ endif
+ if USE_LV2
+ 	install -d -m 755 $(DESTDIR)$(lv2dir)
+ 	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
+-if USE_LV2_GUI
+-	install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
+-endif
+ 	rm -f $(DESTDIR)$(lv2dir)/*.ttl
+ 	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
+ if USE_SORDI


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2021-04-13 22:37 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-04-13 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ac4548716579aa4098ab08dc74b89a4f4ad0a88b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 21:57:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 22:37:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac454871

media-plugins/calf: disable broken slibtool patch for now

Seems to break some symlinks, pending fix upstream.

Closes: https://bugs.gentoo.org/779343
Bug: https://bugs.gentoo.org/778314
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{calf-0.90.3.ebuild => calf-0.90.3-r1.ebuild}  |   1 -
 .../calf/files/calf-0.90.3-slibtool.patch          | 118 ---------------------
 2 files changed, 119 deletions(-)

diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3-r1.ebuild
similarity index 97%
rename from media-plugins/calf/calf-0.90.3.ebuild
rename to media-plugins/calf/calf-0.90.3-r1.ebuild
index ca5c968e7df..c459fd25c34 100644
--- a/media-plugins/calf/calf-0.90.3.ebuild
+++ b/media-plugins/calf/calf-0.90.3-r1.ebuild
@@ -46,7 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.90.3-slibtool.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/files/calf-0.90.3-slibtool.patch b/media-plugins/calf/files/calf-0.90.3-slibtool.patch
deleted file mode 100644
index 35a4c4ee941..00000000000
--- a/media-plugins/calf/files/calf-0.90.3-slibtool.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://github.com/calf-studio-gear/calf/pull/288
-https://bugs.gentoo.org/778314
-
-From d18a873ebc92bd1eee2b3f61b7768a195fe6906a Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 26 Mar 2021 17:47:11 -0700
-Subject: [PATCH 1/2] build: Use canonical libtool library names.
-
----
- src/Makefile.am | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index dd6bb8aa0..66119b4d1 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@ bin_PROGRAMS =
- noinst_LTLIBRARIES =
- 
- noinst_PROGRAMS = calfbenchmark
--pkglib_LTLIBRARIES = calf.la
-+pkglib_LTLIBRARIES = libcalf.la
- 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
- # TODO: Remove -finline flags is clang is used
-@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
- noinst_LTLIBRARIES += libcalfgui.la
- bin_PROGRAMS += calfjackhost 
- calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp
--calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
-+calfjackhost_LDADD = libcalfgui.la libcalf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
- if USE_LASH
- AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
- calfjackhost_LDADD += $(LASH_DEPS_LIBS)
-@@ -32,31 +32,31 @@ endif
- AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
- noinst_PROGRAMS += calfmakerdf
- calfmakerdf_SOURCES = makerdf.cpp
--calfmakerdf_LDADD = calf.la
-+calfmakerdf_LDADD = libcalf.la
- 
- calfbenchmark_SOURCES = benchmark.cpp
--calfbenchmark_LDADD = calf.la
-+calfbenchmark_LDADD = libcalf.la
- 
--calf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
--calf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS) 
-+libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
-+libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
- if USE_DEBUG
--calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
-+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
- else
--calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
-+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
- endif
- 
- if USE_LV2_GUI
- 
- # Version WITH out-of-process GUI - links GTK+, UI controls etc.
- 
--noinst_LTLIBRARIES += calflv2gui.la
-+noinst_LTLIBRARIES += libcalflv2gui.la
- 
--calflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
-+libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
- 
- if USE_DEBUG
--calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- else
--calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- endif
- 
- endif
-
-From 75f33e02d3c9d0acf2bee59fd286cbc98f0d3d67 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 26 Mar 2021 17:47:39 -0700
-Subject: [PATCH 2/2] build: Use libtool to isntall libtool libraries.
-
----
- src/Makefile.am | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 66119b4d1..93361aaad 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,7 +49,8 @@ if USE_LV2_GUI
- 
- # Version WITH out-of-process GUI - links GTK+, UI controls etc.
- 
--noinst_LTLIBRARIES += libcalflv2gui.la
-+if USE_LV2_GUI
-+pkglib_LTLIBRARIES += libcalflv2gui.la
- 
- libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
- 
-@@ -58,6 +59,7 @@ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI
- else
- libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- endif
-+endif
- 
- endif
- 
-@@ -78,9 +80,6 @@ endif
- if USE_LV2
- 	install -d -m 755 $(DESTDIR)$(lv2dir)
- 	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
--if USE_LV2_GUI
--	install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
--endif
- 	rm -f $(DESTDIR)$(lv2dir)/*.ttl
- 	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
- if USE_SORDI


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2023-09-22 15:44 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-09-22 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     308d60bf39e9fffb5d632f7ca012b14b406ba0ff
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Sep 22 00:22:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 15:42:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308d60bf

media-plugins/calf: Fix build with LLD

Upstream-PR: https://github.com/calf-studio-gear/calf/pull/332
Closes: https://bugs.gentoo.org/740158
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...calf-0.90.3-r1.ebuild => calf-0.90.3-r2.ebuild} |  1 +
 media-plugins/calf/calf-9999.ebuild                |  1 +
 .../files/calf-0.90.3-fix-build-with-lld.patch     | 26 ++++++++++++++++++++++
 .../calf/files/calf-9999-fix-build-with-lld.patch  | 26 ++++++++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/media-plugins/calf/calf-0.90.3-r1.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild
similarity index 96%
rename from media-plugins/calf/calf-0.90.3-r1.ebuild
rename to media-plugins/calf/calf-0.90.3-r2.ebuild
index f0c3d8cae4e9..0d4c5797eb81 100644
--- a/media-plugins/calf/calf-0.90.3-r1.ebuild
+++ b/media-plugins/calf/calf-0.90.3-r2.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.90.3-fix-build-with-lld.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index ac7a768dcf5c..26b234a8a03a 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
+	"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch b/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch
new file mode 100644
index 000000000000..451f1baff9e5
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch
@@ -0,0 +1,26 @@
+From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 21 Sep 2023 19:08:39 -0400
+Subject: [PATCH] Fix build with LLD
+
+LLVM's LLD handles the -retain-symbols-file option (used by
+-export-symbols-regex in libtool) differently from GNU ld, causing
+undefined references during link. This commit removes the
+-export-symbols-regex option from libcalf_la_LDFLAGS since by default
+libtool exports all symbols anyway, so it should not be necessary.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
+ if USE_DEBUG
+ calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ else
+-calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
++calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ endif
+ 
+ if USE_LV2_GUI
+-- 
+2.42.0
+

diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
new file mode 100644
index 000000000000..816da77f7d0d
--- /dev/null
+++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
@@ -0,0 +1,26 @@
+From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 21 Sep 2023 19:08:39 -0400
+Subject: [PATCH] Fix build with LLD
+
+LLVM's LLD handles the -retain-symbols-file option (used by
+-export-symbols-regex in libtool) differently from GNU ld, causing
+undefined references during link. This commit removes the
+-export-symbols-regex option from libcalf_la_LDFLAGS since by default
+libtool exports all symbols anyway, so it should not be necessary.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
+ if USE_DEBUG
+ libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ else
+-libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
++libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ endif
+ 
+ if USE_LV2_GUI
+-- 
+2.42.0
+


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2023-09-22 15:44 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-09-22 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8fc4a928bfd3c81a153c7094a52a5180d76521de
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Sep 22 00:24:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 15:42:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc4a928

media-plugins/calf: Remove usage of std::bind2nd

Fixes build with C++17+.

Upstream-PR: https://github.com/calf-studio-gear/calf/pull/331
Closes: https://bugs.gentoo.org/914506
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/calf/calf-0.90.3-r2.ebuild           |  1 +
 media-plugins/calf/calf-9999.ebuild                |  1 +
 .../files/calf-0.90.3-replace-std-bind2nd.patch    | 32 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/media-plugins/calf/calf-0.90.3-r2.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild
index 0d4c5797eb81..45506cd79a76 100644
--- a/media-plugins/calf/calf-0.90.3-r2.ebuild
+++ b/media-plugins/calf/calf-0.90.3-r2.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
 	"${FILESDIR}/${PN}-0.90.3-fix-build-with-lld.patch"
+	"${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 26b234a8a03a..f232db75e494 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
 	"${FILESDIR}/${PN}-9999-fix-build-with-lld.patch"
+	"${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch"
 )
 
 src_prepare() {

diff --git a/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch b/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch
new file mode 100644
index 000000000000..5ba16efcfb1b
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch
@@ -0,0 +1,32 @@
+From https://github.com/calf-studio-gear/calf/pull/331/commits/849a0b589fb86cb4b9869738b270fd24859bd23b Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 21 Sep 2023 18:16:35 -0400
+Subject: [PATCH] Replace use of std::bind2nd with std::bind
+
+std::bind2nd was deprecated in C++11 and removed in C++17. Remove usage
+of it and replace with std::bind.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- a/src/calf/orfanidis_eq.h
++++ b/src/calf/orfanidis_eq.h
+@@ -748,7 +748,7 @@ private:
+ 			std::vector<eq_double_t> v = landen(k, tol);
+ 
+ 			std::transform(v.begin(), v.end(), v.begin(),
+-			    bind2nd(std::plus<eq_double_t>(), 1.0));
++			    bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1));
+ 
+ 			K = std::accumulate(v.begin(), v.end(),
+ 			    1, std::multiplies<eq_double_t>()) * M_PI/2.0;
+@@ -764,7 +764,7 @@ private:
+ 			std::vector<eq_double_t> vp = landen(kp, tol);
+ 
+ 			std::transform(vp.begin(), vp.end(), vp.begin(),
+-			    bind2nd(std::plus<eq_double_t>(), 1.0));
++			    bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1));
+ 
+ 			Kprime = std::accumulate(vp.begin(), vp.end(),
+ 			    1.0, std::multiplies<eq_double_t>()) * M_PI/2.0;
+-- 
+2.42.0
+


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2024-11-03  8:53 Miroslav Šulc
  0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2024-11-03  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2d250588a69485963151a67f966513e006e85d8d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 08:53:27 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 08:53:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d250588

media-plugins/calf: bump to 0.9.4 + eapi8 + updated live

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-plugins/calf/Manifest                        |  1 +
 .../calf/{calf-9999.ebuild => calf-0.90.4.ebuild}  | 10 +++++-----
 media-plugins/calf/calf-9999.ebuild                | 10 +++++-----
 ...9999-htmldir.patch => calf-0.9.4-htmldir.patch} |  0
 ...tomagic.patch => calf-0.9.4-no-automagic.patch} |  0
 media-plugins/calf/files/calf-0.90.4-desktop.patch | 22 ++++++++++++++++++++++
 media-plugins/calf/files/calf-9999-desktop.patch   | 14 --------------
 7 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index c691c2aa9cda..08affd7f272d 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1 +1,2 @@
 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
+DIST calf-0.90.4.tar.gz 16119716 BLAKE2B 555a813c6e8d58ea67db349957d2673e614448e17a3e5e934106fa445d7a6c19bc739b2487a883c5e709ac8dd5f429363e3bea09d72c1ca23a5755ca3b765479 SHA512 666d699d989a588bfe9d1e92f6b221a30541c26874d5941f54c2b2f216d2a59d628f1579d1e789e4a40d07d06f43a31055ce67885abb25c032643aa5f75797cd

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-0.90.4.ebuild
similarity index 90%
copy from media-plugins/calf/calf-9999.ebuild
copy to media-plugins/calf/calf-0.90.4.ebuild
index e3c5d724f4ca..05e605bd370c 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-0.90.4.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
 	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -43,9 +43,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-no-automagic.patch"
-	"${FILESDIR}/${PN}-9999-htmldir.patch"
-	"${FILESDIR}/${PN}-9999-desktop.patch"
+	"${FILESDIR}/${PN}-0.9.4-no-automagic.patch"
+	"${FILESDIR}/${PN}-0.9.4-htmldir.patch"
+	"${FILESDIR}/${PN}-0.90.4-desktop.patch"
 )
 
 src_prepare() {
@@ -53,7 +53,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+src_configure()  {
 	# Upstream append -ffast-math by default, however since libtool links C++
 	# shared libs with -nostdlib, this causes symbol resolution error for
 	# __powidn2 when using compiler-rt. Disable fast math on compiler-rt until

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index e3c5d724f4ca..05e605bd370c 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
 	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -43,9 +43,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-no-automagic.patch"
-	"${FILESDIR}/${PN}-9999-htmldir.patch"
-	"${FILESDIR}/${PN}-9999-desktop.patch"
+	"${FILESDIR}/${PN}-0.9.4-no-automagic.patch"
+	"${FILESDIR}/${PN}-0.9.4-htmldir.patch"
+	"${FILESDIR}/${PN}-0.90.4-desktop.patch"
 )
 
 src_prepare() {
@@ -53,7 +53,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+src_configure()  {
 	# Upstream append -ffast-math by default, however since libtool links C++
 	# shared libs with -nostdlib, this causes symbol resolution error for
 	# __powidn2 when using compiler-rt. Disable fast math on compiler-rt until

diff --git a/media-plugins/calf/files/calf-9999-htmldir.patch b/media-plugins/calf/files/calf-0.9.4-htmldir.patch
similarity index 100%
rename from media-plugins/calf/files/calf-9999-htmldir.patch
rename to media-plugins/calf/files/calf-0.9.4-htmldir.patch

diff --git a/media-plugins/calf/files/calf-9999-no-automagic.patch b/media-plugins/calf/files/calf-0.9.4-no-automagic.patch
similarity index 100%
rename from media-plugins/calf/files/calf-9999-no-automagic.patch
rename to media-plugins/calf/files/calf-0.9.4-no-automagic.patch

diff --git a/media-plugins/calf/files/calf-0.90.4-desktop.patch b/media-plugins/calf/files/calf-0.90.4-desktop.patch
new file mode 100644
index 000000000000..4a761162e476
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.4-desktop.patch
@@ -0,0 +1,22 @@
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ * 
+ *      /usr/share/applications/calf.desktop: error: value "0.90.1" for key "Version" in group "Desktop Entry" is not a known version
+ *      /usr/share/applications/calf.desktop: warning: value "Application;AudioVideo;Audio;GNOME" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+
+
+
+--- a/calf.desktop.in
++++ b/calf.desktop.in
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Categories=Application;AudioVideo;Audio;GNOME
++Categories=AudioVideo;Audio;GNOME
+ Exec=calfjackhost
+ Icon=calf
+ Terminal=false
+ Type=Application
+-Version=@VERSION@
+ 
+ Name=Calf Plugin Pack for JACK
+ Name[fr]=Ensemble de greffons Calf pour JACK

diff --git a/media-plugins/calf/files/calf-9999-desktop.patch b/media-plugins/calf/files/calf-9999-desktop.patch
deleted file mode 100644
index 486007e7e06f..000000000000
--- a/media-plugins/calf/files/calf-9999-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/calf.desktop.in
-+++ b/calf.desktop.in
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Categories=Application;AudioVideo;Audio;GNOME
-+Categories=AudioVideo;Audio;GNOME
- Exec=calfjackhost
- Icon=calf
- Terminal=false
- Type=Application
--Version=@VERSION@
- 
- Name=Calf Plugin Pack for JACK
- Name[fr]=Ensemble de greffons Calf pour JACK


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2024-12-07 13:58 Miroslav Šulc
  0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2024-12-07 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4299f7f9747b701a437eca72581ba9a58a21c5fc
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 13:58:44 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 13:58:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4299f7f9

media-plugins/calf: dropped obsolete 0.90.3-r2 + renamed some patches

Bug: https://bugs.gentoo.org/945950
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-plugins/calf/Manifest                        |  1 -
 media-plugins/calf/calf-0.90.3-r2.ebuild           | 85 ----------------------
 media-plugins/calf/calf-0.90.4.ebuild              |  4 +-
 media-plugins/calf/calf-9999.ebuild                |  4 +-
 media-plugins/calf/files/calf-0.90.1-desktop.patch | 24 ------
 media-plugins/calf/files/calf-0.90.1-htmldir.patch | 66 -----------------
 .../calf/files/calf-0.90.1-no-automagic.patch      | 43 -----------
 ...0.90.3-clang-lerp_table_lookup_float_mask.patch | 39 ----------
 .../files/calf-0.90.3-fix-build-with-lld.patch     | 26 -------
 .../files/calf-0.90.3-replace-std-bind2nd.patch    | 32 --------
 ...9.4-htmldir.patch => calf-0.90.4-htmldir.patch} |  0
 ...omagic.patch => calf-0.90.4-no-automagic.patch} |  0
 12 files changed, 4 insertions(+), 320 deletions(-)

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 08affd7f272d..d10ad322fb62 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,2 +1 @@
-DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
 DIST calf-0.90.4.tar.gz 16119716 BLAKE2B 555a813c6e8d58ea67db349957d2673e614448e17a3e5e934106fa445d7a6c19bc739b2487a883c5e709ac8dd5f429363e3bea09d72c1ca23a5755ca3b765479 SHA512 666d699d989a588bfe9d1e92f6b221a30541c26874d5941f54c2b2f216d2a59d628f1579d1e789e4a40d07d06f43a31055ce67885abb25c032643aa5f75797cd

diff --git a/media-plugins/calf/calf-0.90.3-r2.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild
deleted file mode 100644
index 1c0266945303..000000000000
--- a/media-plugins/calf/calf-0.90.3-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="https://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs"
-
-REQUIRED_USE="jack? ( gtk )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth:=
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
-	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
-	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.90.3-fix-build-with-lld.patch"
-	"${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch"
-	"${FILESDIR}/${PN}-0.90.3-clang-lerp_table_lookup_float_mask.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure()  {
-	# Upstream append -ffast-math by default, however since libtool links C++
-	# shared libs with -nostdlib, this causes symbol resolution error for
-	# __powidn2 when using compiler-rt. Disable fast math on compiler-rt until
-	# a better fix is found.
-	[[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math"
-
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--without-obsolete-check
-		$(use_enable experimental)
-		$(use_enable gtk gui)
-		$(use_enable jack)
-		$(use_with lash)
-		$(use_with lv2 lv2)
-		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "")
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse sse)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/share/bash-completion/completions/calf \
-		"${ED}"/usr/share/bash-completion/completions/calfjackhost
-}

diff --git a/media-plugins/calf/calf-0.90.4.ebuild b/media-plugins/calf/calf-0.90.4.ebuild
index 20e61d91459d..40087f6e07c6 100644
--- a/media-plugins/calf/calf-0.90.4.ebuild
+++ b/media-plugins/calf/calf-0.90.4.ebuild
@@ -43,8 +43,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.4-no-automagic.patch"
-	"${FILESDIR}/${PN}-0.9.4-htmldir.patch"
+	"${FILESDIR}/${PN}-0.90.4-no-automagic.patch"
+	"${FILESDIR}/${PN}-0.90.4-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.4-desktop.patch"
 )
 

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 05e605bd370c..7afb6c757c68 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -43,8 +43,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.4-no-automagic.patch"
-	"${FILESDIR}/${PN}-0.9.4-htmldir.patch"
+	"${FILESDIR}/${PN}-0.90.4-no-automagic.patch"
+	"${FILESDIR}/${PN}-0.90.4-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.4-desktop.patch"
 )
 

diff --git a/media-plugins/calf/files/calf-0.90.1-desktop.patch b/media-plugins/calf/files/calf-0.90.1-desktop.patch
deleted file mode 100644
index 47b269d92ee6..000000000000
--- a/media-plugins/calf/files/calf-0.90.1-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- * QA Notice: This package installs one or more .desktop files that do not
- * pass validation.
- * 
- *      /usr/share/applications/calf.desktop: error: value "0.90.1" for key "Version" in group "Desktop Entry" is not a known version
- *      /usr/share/applications/calf.desktop: warning: value "Application;AudioVideo;Audio;GNOME" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
-
-
---- a/calf.desktop.in
-+++ b/calf.desktop.in
-@@ -3,7 +3,6 @@
- Name[pl]=Zestaw wtyczek Calf
- Name[ru]=Набор эффектов и инструментов Calf для JACK
- Name[fr]=Ensemble de greffons Calf pour JACK
--Version=@VERSION@
- Comment=Process and produce sounds using a set of plugins with JACK interface
- Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
- Comment[ru]=Обработка и создание музыки при помощи эффектов и инструментов через JACK
-@@ -11,5 +10,5 @@
- Exec=calfjackhost
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;Audio;GNOME
-+Categories=AudioVideo;Audio;GNOME
- Icon=calf

diff --git a/media-plugins/calf/files/calf-0.90.1-htmldir.patch b/media-plugins/calf/files/calf-0.90.1-htmldir.patch
deleted file mode 100644
index a6c4b2c7ffff..000000000000
--- a/media-plugins/calf/files/calf-0.90.1-htmldir.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Make PKGDOCDIR configurable for distributions.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,7 +227,7 @@
- 
- # Other defines
- AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
--AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
-+AC_DEFINE_UNQUOTED(PKGDOCDIR,"$htmldir",[Calf documentation directory])
- 
- ############################################################################################
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,29 +25,29 @@
- 	rm -rf autom4te.cache
- 
- install-data-local:
--	install -d -m 755 $(DESTDIR)$(docdir)
--	install -d -m 755 $(DESTDIR)$(docdir)/images
--	install -d -m 755 $(DESTDIR)$(docdir)/images/icons
--	install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto
--	install -d -m 755 $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded
--	install -d -m 755 $(DESTDIR)$(docdir)/scripts
-+	install -d -m 755 $(DESTDIR)$(htmldir)
-+	install -d -m 755 $(DESTDIR)$(htmldir)/images
-+	install -d -m 755 $(DESTDIR)$(htmldir)/images/icons
-+	install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto
-+	install -d -m 755 $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded
-+	install -d -m 755 $(DESTDIR)$(htmldir)/scripts
- 	install -d -m 755 $(DESTDIR)$(pkgdatadir)/sf2
--	install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir)
--	install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
--	install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(docdir)/images/
--	install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/
--	install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(docdir)/images/icons/
--	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
--	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(htmldir)
-+	install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(htmldir)/images/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/images/*.jpg $(DESTDIR)$(htmldir)/images/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/images/prettyPhoto/dark_rounded/* $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/images/icons/* $(DESTDIR)$(htmldir)/images/icons/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(htmldir)/scripts/
-+	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(htmldir)/scripts/
- 	install -c -m 644 $(top_srcdir)/sf2/*.sf2 $(DESTDIR)$(pkgdatadir)/sf2/
- 	    
- uninstall-local:
--	rm -f $(DESTDIR)$(docdir)/*.html
--	rm -f $(DESTDIR)$(docdir)/images/*.png
--	rm -f $(DESTDIR)$(docdir)/images/*.jpg
--	rm -f $(DESTDIR)$(docdir)/images/icons/*.png
--	rm -f $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded/*
--	rm -f $(DESTDIR)$(docdir)/scripts/*.css
--	rm -f $(DESTDIR)$(docdir)/scripts/*.js
-+	rm -f $(DESTDIR)$(htmldir)/*.html
-+	rm -f $(DESTDIR)$(htmldir)/images/*.png
-+	rm -f $(DESTDIR)$(htmldir)/images/*.jpg
-+	rm -f $(DESTDIR)$(htmldir)/images/icons/*.png
-+	rm -f $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded/*
-+	rm -f $(DESTDIR)$(htmldir)/scripts/*.css
-+	rm -f $(DESTDIR)$(htmldir)/scripts/*.js
- 	rm -f $(DESTDIR)$(pkgdatadir)/sf2/*.sf2
--	rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images/icons $(DESTDIR)$(docdir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(docdir)/images/prettyPhoto $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) $(DESTDIR)$(pkgdatadir)/sf2 || true
-+	rmdir $(DESTDIR)$(htmldir)/scripts $(DESTDIR)$(htmldir)/images/icons $(DESTDIR)$(htmldir)/images/prettyPhoto/dark_rounded $(DESTDIR)$(htmldir)/images/prettyPhoto $(DESTDIR)$(htmldir)/images $(DESTDIR)$(htmldir) $(DESTDIR)$(pkgdatadir)/sf2 || true

diff --git a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch b/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
deleted file mode 100644
index e9b9756338d8..000000000000
--- a/media-plugins/calf/files/calf-0.90.1-no-automagic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix gtk+ and jack automagic detection.
-
-https://github.com/calf-studio-gear/calf/issues/166
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,13 +150,35 @@
-   [set_enable_sse="no"])
- AC_MSG_RESULT($set_enable_sse)
- 
-+AC_MSG_CHECKING([whether to enable GUI])
-+AC_ARG_ENABLE(gui,
-+  AS_HELP_STRING([--enable-gui],[enable graphical user interface]),
-+  [set_enable_gui=$enableval],
-+  [set_enable_gui=yes])
-+AC_MSG_RESULT($set_enable_gui)
-+
-+AC_MSG_CHECKING([whether to enable JACK])
-+AC_ARG_ENABLE(jack,
-+  AS_HELP_STRING([--enable-jack],[enable support for JACK]),
-+  [set_enable_jack=$enableval],
-+  [set_enable_jack=yes])
-+AC_MSG_RESULT($set_enable_jack)
-+
- ############################################################################################
- # Compute status shell variables
- 
--if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
-+if test "x$set_enable_gui" = "xno"; then
-+  GUI_ENABLED="no (disabled by user choice)"
-+fi
-+
-+if test "$JACK_FOUND" = "yes"; then
-   JACK_ENABLED="yes"
- fi
- 
-+if test "x$set_enable_jack" = "xno"; then
-+  JACK_ENABLED="no (disabled by user choice)"
-+fi
-+
- if test "$GUI_ENABLED" = "yes" -a "$LV2_ENABLED" = "yes"; then
-   LV2_GUI_ENABLED="yes"
- fi

diff --git a/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch b/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch
deleted file mode 100644
index 3ab8dfa1c840..000000000000
--- a/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bfb857445e72230659493d3491970e3cb3c7eb9a Mon Sep 17 00:00:00 2001
-From: Krzysztof Foltman <wdev@foltman.com>
-Date: Fri, 2 Aug 2019 20:55:50 +0100
-Subject: [PATCH] Compatibility: A possible fix for the clang++-8 issue.
-
---- a/src/calf/fixed_point.h
-+++ b/src/calf/fixed_point.h
-@@ -215,7 +215,7 @@ template<class T, int FracBits> class fixed_point {
-     }
- 
-     template<class U, int UseBits> 
--    inline U lerp_table_lookup_int(U data[(1U<<IntBits)+1]) const {
-+    inline U lerp_table_lookup_int(U *data) const {
-         unsigned int pos = uipart();
-         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
-     }
-@@ -223,19 +223,19 @@ template<class T, int FracBits> class fixed_point {
-     /// Untested... I've started it to get a sin/cos readout for rotaryorgan, but decided to use table-less solution instead
-     /// Do not assume it works, because it most probably doesn't
-     template<class U, int UseBits> 
--    inline U lerp_table_lookup_int_shift(U data[(1U<<IntBits)+1], unsigned int shift) {
-+    inline U lerp_table_lookup_int_shift(U *data, unsigned int shift) {
-         unsigned int pos = (uipart() + shift) & ((1ULL << IntBits) - 1);
-         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
-     }
- 
-     template<class U> 
--    inline U lerp_table_lookup_float(U data[(1U<<IntBits)+1]) const {
-+    inline U lerp_table_lookup_float(U *data) const {
-         unsigned int pos = uipart();
-         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();
-     }
- 
-     template<class U> 
--    inline U lerp_table_lookup_float_mask(U data[(1U<<IntBits)+1], unsigned int mask) const {
-+    inline U lerp_table_lookup_float_mask(U *data, unsigned int mask) const {
-         unsigned int pos = ui64part() & mask;
-         // printf("full = %lld pos = %d + %f\n", value, pos, fpart_as_double());
-         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();

diff --git a/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch b/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch
deleted file mode 100644
index 451f1baff9e5..000000000000
--- a/media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From https://github.com/calf-studio-gear/calf/pull/332/commits/bdaaa92dd82e2425e4683b9d496370c5880e3b3e Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 21 Sep 2023 19:08:39 -0400
-Subject: [PATCH] Fix build with LLD
-
-LLVM's LLD handles the -retain-symbols-file option (used by
--export-symbols-regex in libtool) differently from GNU ld, causing
-undefined references during link. This commit removes the
--export-symbols-regex option from libcalf_la_LDFLAGS since by default
-libtool exports all symbols anyway, so it should not be necessary.
-
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
- if USE_DEBUG
- calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
- else
--calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
-+calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
- endif
- 
- if USE_LV2_GUI
--- 
-2.42.0
-

diff --git a/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch b/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch
deleted file mode 100644
index 5ba16efcfb1b..000000000000
--- a/media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From https://github.com/calf-studio-gear/calf/pull/331/commits/849a0b589fb86cb4b9869738b270fd24859bd23b Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 21 Sep 2023 18:16:35 -0400
-Subject: [PATCH] Replace use of std::bind2nd with std::bind
-
-std::bind2nd was deprecated in C++11 and removed in C++17. Remove usage
-of it and replace with std::bind.
-
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
---- a/src/calf/orfanidis_eq.h
-+++ b/src/calf/orfanidis_eq.h
-@@ -748,7 +748,7 @@ private:
- 			std::vector<eq_double_t> v = landen(k, tol);
- 
- 			std::transform(v.begin(), v.end(), v.begin(),
--			    bind2nd(std::plus<eq_double_t>(), 1.0));
-+			    bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1));
- 
- 			K = std::accumulate(v.begin(), v.end(),
- 			    1, std::multiplies<eq_double_t>()) * M_PI/2.0;
-@@ -764,7 +764,7 @@ private:
- 			std::vector<eq_double_t> vp = landen(kp, tol);
- 
- 			std::transform(vp.begin(), vp.end(), vp.begin(),
--			    bind2nd(std::plus<eq_double_t>(), 1.0));
-+			    bind(std::plus<eq_double_t>(), 1.0, std::placeholders::_1));
- 
- 			Kprime = std::accumulate(vp.begin(), vp.end(),
- 			    1.0, std::multiplies<eq_double_t>()) * M_PI/2.0;
--- 
-2.42.0
-

diff --git a/media-plugins/calf/files/calf-0.9.4-htmldir.patch b/media-plugins/calf/files/calf-0.90.4-htmldir.patch
similarity index 100%
rename from media-plugins/calf/files/calf-0.9.4-htmldir.patch
rename to media-plugins/calf/files/calf-0.90.4-htmldir.patch

diff --git a/media-plugins/calf/files/calf-0.9.4-no-automagic.patch b/media-plugins/calf/files/calf-0.90.4-no-automagic.patch
similarity index 100%
rename from media-plugins/calf/files/calf-0.9.4-no-automagic.patch
rename to media-plugins/calf/files/calf-0.90.4-no-automagic.patch


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2025-06-02 15:19 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2025-06-02 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7cdbe0cf6a36c1271e1060a52a1f057e434d4939
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 19:19:53 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 15:14:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdbe0cf

media-plugins/calf: IUSE gtk -> gui, fix desktop file and buildsys

GNUInstallDirs patch makes downstream docdir patch obsolete, is prerequisite
for follow-up patches and as an aside, fixes library install dir.

Closes: https://bugs.gentoo.org/954142
Closes: https://bugs.gentoo.org/955628
Closes: https://bugs.gentoo.org/957044
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-plugins/calf/calf-0.90.6-r1.ebuild           |  75 +++++++++++
 .../calf/files/calf-0.90.6-desktop-file.patch      |  65 +++++++++
 .../calf/files/calf-0.90.6-gnuinstalldirs.patch    | 148 +++++++++++++++++++++
 media-plugins/calf/files/calf-0.90.6-lv2gui.patch  |  24 ++++
 4 files changed, 312 insertions(+)

diff --git a/media-plugins/calf/calf-0.90.6-r1.ebuild b/media-plugins/calf/calf-0.90.6-r1.ebuild
new file mode 100644
index 000000000000..4b6658e02954
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.6-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="https://calf-studio-gear.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse experimental gui jack lash lv2"
+
+REQUIRED_USE="jack? ( gui )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-libs/expat
+	dev-libs/glib:2
+	media-sound/fluidsynth:=
+	gui? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gnuinstalldirs.patch" # in 0.90.7
+	# pending upstream PRs:
+	"${FILESDIR}/${P}-desktop-file.patch" # bug 955628
+	"${FILESDIR}/${P}-lv2gui.patch" # bug 954142
+)
+
+src_configure() {
+	# Upstream append -ffast-math by default, however since libtool links C++
+	# shared libs with -nostdlib, this causes symbol resolution error for
+	# __powidn2 when using compiler-rt. Disable fast math on compiler-rt until
+	# a better fix is found.
+	[[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math"
+
+	local mycmakeargs=(
+		-DWANT_GUI=$(usex gui)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LV2=$(usex lv2)
+		-DWANT_LV2_GUI=$(usex lv2)
+		-DWANT_SORDI=ON
+		-DWANT_EXPERIMENTAL=$(usex experimental)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	mv "${ED}"/usr/share/bash-completion/completions/calf \
+		"${ED}"/usr/share/bash-completion/completions/calfjackhost || die "Failed to install bash completion"
+}

diff --git a/media-plugins/calf/files/calf-0.90.6-desktop-file.patch b/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
new file mode 100644
index 000000000000..0472d08981cf
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
@@ -0,0 +1,65 @@
+From: https://github.com/calf-studio-gear/calf/pull/385
+
+From c88956484bc06cc3192303b71a6f4907d5ea34c5 Mon Sep 17 00:00:00 2001
+From: Johannes Lorenz <j.git@lorenz-ho.me>
+Date: Sat, 17 May 2025 16:26:03 +0200
+Subject: [PATCH] Fix calf.desktop
+
+The `Version` must be the "Version of the Desktop Entry Specification",
+and not of the application.
+
+This also updates/fixes the `Categories` section.
+
+Fixes https://955628.bugs.gentoo.org/attachment.cgi?id=928147 .
+---
+ .gitignore                      | 1 -
+ .svnignore                      | 1 -
+ CMakeLists.txt                  | 3 +--
+ calf.desktop.in => calf.desktop | 7 ++++---
+ configure.ac.deprecated         | 1 -
+ 5 files changed, 5 insertions(+), 8 deletions(-)
+ rename calf.desktop.in => calf.desktop (95%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd723ed70..5b976127d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -200,7 +200,6 @@ else()
+ endif()
+ 
+ configure_file(config.h.cmake.in config.h)
+-configure_file(${PROJECT_NAME}.desktop.in ${PROJECT_NAME}.desktop)
+ include_directories(${CMAKE_BINARY_DIR})
+ 
+ #
+@@ -231,7 +230,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts/
+         DESTINATION ${CMAKE_INSTALL_DOCDIR}/scripts FILES_MATCHING PATTERN "*.js")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/sf2/
+         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2")
+-install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop
++install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.desktop
+         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1
+         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+diff --git a/calf.desktop.in b/calf.desktop
+similarity index 95%
+rename from calf.desktop.in
+rename to calf.desktop
+index 3514ee874..c0a2071ac 100644
+--- a/calf.desktop.in
++++ b/calf.desktop
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+-Categories=Application;AudioVideo;Audio;GNOME
++Type=Application
++Version=1.5
++
++Categories=AudioVideo;Audio;Sequencer;X-Jack;GTK
+ Exec=calfjackhost
+ Icon=calf
+ Terminal=false
+-Type=Application
+-Version=@VERSION@
+ 
+ Name=Calf Plugin Pack for JACK
+ Name[fr]=Ensemble de greffons Calf pour JACK

diff --git a/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch b/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch
new file mode 100644
index 000000000000..8f2a2aba34d4
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch
@@ -0,0 +1,148 @@
+From 063812ffd37edb99e14f7a3d224fbf999a506252 Mon Sep 17 00:00:00 2001
+From: Johannes Lorenz <j.git@lorenz-ho.me>
+Date: Fri, 2 May 2025 13:59:50 +0200
+Subject: [PATCH] Use GNUInstallDirs for flexible `bin`, `lib` and `doc`
+
+---
+ CMakeLists.txt     | 16 ++++++++--------
+ src/CMakeLists.txt | 33 +++++++++++++++++----------------
+ 2 files changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df2fde638..cfed21b69 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,21 +210,21 @@ add_subdirectory(icons)
+ 
+ include(GNUInstallDirs)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/
+-        DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.html")
++        DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.html")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/
+-        DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.png")
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/images FILES_MATCHING PATTERN "*.png")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/
+-        DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.jpg")
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/images FILES_MATCHING PATTERN "*.jpg")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/prettyPhoto/dark_rounded/
+-        DESTINATION share/doc/${PROJECT_NAME}/images/prettyPhoto/dark_rounded)
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/images/prettyPhoto/dark_rounded)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/icons/
+-        DESTINATION share/doc/${PROJECT_NAME}/images/icons)
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/images/icons)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts
+-        DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.css")
++        DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.css")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts/
+-        DESTINATION share/doc/${PROJECT_NAME}/scripts FILES_MATCHING PATTERN "*.js")
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/scripts FILES_MATCHING PATTERN "*.js")
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/sf2/
+-        DESTINATION share/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2")
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2")
+ install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop
+         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1e1cd30d9..da22ec1ab 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ #
+ 
+ include(CheckLinkerFlag)
++include(GNUInstallDirs)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -57,7 +58,7 @@ endif()
+ 
+ 
+ if(USE_LV2 AND USE_GUI)
+-    set(LV2DIR "${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2")
++    set(LV2DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2")
+     add_library(${PROJECT_NAME}lv2gui SHARED gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp)
+     target_include_directories(${PROJECT_NAME}lv2gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+     check_linker_flag(CXX -Wl,-z,nodelete LINKER_SUPPORTS_NODELETE)
+@@ -81,7 +82,7 @@ if(USE_GUI AND USE_JACK)
+     target_link_libraries(${PROJECT_NAME}jackhost PRIVATE Threads::Threads ${PROJECT_NAME}gui ${PROJECT_NAME} ${JACK_LIBRARIES} ${GTK_LIBRARIES} fluidsynth)
+     
+     set_target_properties(${PROJECT_NAME}jackhost PROPERTIES
+-        INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"
++        INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}"
+         BUILD_WITH_INSTALL_RPATH TRUE
+     )
+ endif()
+@@ -109,59 +110,59 @@ if(USE_GUI)
+     install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}-gui.xml
+             DESTINATION share/${PROJECT_NAME}/)
+     if(USE_JACK)
+-        install(TARGETS ${PROJECT_NAME}jackhost DESTINATION bin)
++        install(TARGETS ${PROJECT_NAME}jackhost DESTINATION ${CMAKE_INSTALL_BINDIR})
+     endif()
+ endif()
+ 
+ # Install libs
+-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/${PROJECT_NAME})
++install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+ if(USE_GUI)
+-    install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION lib/${PROJECT_NAME})
++    install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+ endif()
+ 
+ if(USE_LV2)
+     # Create Lv2 install dir
+-    install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2\")"
++    install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2\")"
+             RESULT_VARIABLE calfResult)
+     if(NOT ${calfResult} EQUAL 0)
+-        message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/")
++        message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/")
+     endif()
+     # Create symlinks from Lv2 install dir to libs
+     install(CODE "execute_process( \
+         COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \
+-	\"${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/lib${PROJECT_NAME}.so\" \
+-	\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so\" \
++	\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/lib${PROJECT_NAME}.so\" \
++	\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so\" \
+         )"
+         RESULT_VARIABLE calfResult
+     )
+     if(NOT ${calfResult} EQUAL 0)
+-        message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so")
++        message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}.so")
+     endif()
+     if(USE_GUI)
+         install(CODE "execute_process( \
+             COMMAND \"${CMAKE_COMMAND}\" -E create_symlink \
+-            \"${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/lib${PROJECT_NAME}lv2gui.so\" \
+-            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so\" \
++            \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/lib${PROJECT_NAME}lv2gui.so\" \
++            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so\" \
+             )"
+             RESULT_VARIABLE calfResult
+         )
+         if(NOT ${calfResult} EQUAL 0)
+-            message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so")
++            message(FATAL_ERROR "Could not create ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/${PROJECT_NAME}lv2gui.so")
+         endif()
+     endif()
+ 
+     # Remove previous .ttl files
+-    file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/lib/lv2/*.ttl")
++    file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/*.ttl")
+     foreach(ttl_file ${ttl_files})
+         file(REMOVE "${ttl_file}")
+     endforeach()
+ 
+     # Install new .ttl files
+-    install(CODE "execute_process(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}makerdf\" -m ttl -p \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2\" -d \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")")
++    install(CODE "execute_process(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}makerdf\" -m ttl -p \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2\" -d \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")")
+ 
+     # Check files with "sordi"
+     if(USE_SORDI)
+-        file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/lib/lv2/${PROJECT_NAME}.lv2/*.ttl")
++        file(GLOB ttl_files "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lv2/${PROJECT_NAME}.lv2/*.ttl")
+         foreach(ttl_file ${ttl_files})
+             install(
+                 CODE "execute_process(COMMAND \"${SORDI}\" -o turtle \"${ttl_file}\")"

diff --git a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch b/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
new file mode 100644
index 000000000000..4f31f3c46f13
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
@@ -0,0 +1,24 @@
+From: https://github.com/calf-studio-gear/calf/pull/384
+
+From 4f6adaa9bea90bfceaca02334a1a9f1642016444 Mon Sep 17 00:00:00 2001
+From: Johannes Lorenz <j.git@lorenz-ho.me>
+Date: Fri, 16 May 2025 20:54:44 +0200
+Subject: [PATCH] Fix #383: Only install lv2gui if Lv2 *and* GUI are set
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f8021af63..372af67a4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -121,7 +121,7 @@ endif()
+ 
+ # Install libs
+ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+-if(USE_GUI)
++if(USE_LV2 AND USE_GUI)
+     install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+ endif()
+ 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2025-06-07 19:36 Miroslav Šulc
  0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2025-06-07 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     8ab9a95ceadbbc90cf6b5dd53fd896642fffa147
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 19:36:33 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 19:36:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab9a95c

media-plugins/calf: bump to 0.90.7 + updated live + scrubbed patches

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-plugins/calf/Manifest                           |  1 +
 .../calf/{calf-9999.ebuild => calf-0.90.7.ebuild}     | 19 +++++++++++++------
 media-plugins/calf/calf-9999.ebuild                   | 16 ++++++++++------
 .../calf/files/calf-0.90.6-desktop-file.patch         | 13 -------------
 .../calf/files/calf-0.90.6-gnuinstalldirs.patch       |  9 ---------
 media-plugins/calf/files/calf-0.90.6-lv2gui.patch     |  6 ------
 ...f-0.90.6-lv2gui.patch => calf-0.90.7-lv2gui.patch} | 12 +++---------
 .../calf/files/calf-0.90.7-no-remove-ttl.patch        | 15 +++++++++++++++
 8 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 1f01207445a7..8fe2e96e6757 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,2 +1,3 @@
 DIST calf-0.90.4.tar.gz 16119716 BLAKE2B 555a813c6e8d58ea67db349957d2673e614448e17a3e5e934106fa445d7a6c19bc739b2487a883c5e709ac8dd5f429363e3bea09d72c1ca23a5755ca3b765479 SHA512 666d699d989a588bfe9d1e92f6b221a30541c26874d5941f54c2b2f216d2a59d628f1579d1e789e4a40d07d06f43a31055ce67885abb25c032643aa5f75797cd
 DIST calf-0.90.6.tar.gz 16119636 BLAKE2B b3eeb198d3df09880de2f053f838f8300c53a19440cbaff5d6fb75d7fbb37e47a6853b31d683f5caf181863cc4698c1d3fda24d277aab1e7867c2162f1279aab SHA512 60f794ba8333b7be92bede3051a416f67e1cca6334e182bf51664456286811eb84a63a5f13522af55540e46d5d01a2e7c85841284aeb3fbdf4875874cf44d182
+DIST calf-0.90.7.tar.gz 16119531 BLAKE2B a9262be48c955901617aac1d1abafbe523eab5cdea6671aa87d6372eba70fedfe2e636e5f66b83cc1d9107de56ec34ed4feb1e4fbf1e1e880e005ed473b84c1d SHA512 a407566717ee31fd26e17ff1e6cd412ecf7a0abef58314c632ef08cc1d80f26e9243b363de82958eb3cc5754dc79af3a682782be0c2654f821bbbcaef9c58f3d

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-0.90.7.ebuild
similarity index 77%
copy from media-plugins/calf/calf-9999.ebuild
copy to media-plugins/calf/calf-0.90.7.ebuild
index e025c0c1b438..11cb2d71b2b1 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-0.90.7.ebuild
@@ -5,10 +5,10 @@ EAPI=8
 
 inherit cmake flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+DESCRIPTION="Set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="https://calf-studio-gear.org/"
 
-if [[ "${PV}" = "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
@@ -18,9 +18,9 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2"
+IUSE="cpu_flags_x86_sse experimental gui jack lash lv2"
 
-REQUIRED_USE="jack? ( gtk )"
+REQUIRED_USE="jack? ( gui )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -30,7 +30,7 @@ DEPEND="
 	dev-libs/expat
 	dev-libs/glib:2
 	media-sound/fluidsynth:=
-	gtk? (
+	gui? (
 		x11-libs/cairo
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
@@ -42,6 +42,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# pending upstream PRs:
+	"${FILESDIR}/${PN}-0.90.6-desktop-file.patch" # bug 955628
+	"${FILESDIR}/${PN}-0.90.7-lv2gui.patch" # bug 954142
+	"${FILESDIR}/${PN}-0.90.7-no-remove-ttl.patch"
+)
+
 src_configure() {
 	# Upstream append -ffast-math by default, however since libtool links C++
 	# shared libs with -nostdlib, this causes symbol resolution error for
@@ -50,7 +57,7 @@ src_configure() {
 	[[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math"
 
 	local mycmakeargs=(
-		-DWANT_GUI=$(usex gtk)
+		-DWANT_GUI=$(usex gui)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_LASH=$(usex lash)
 		-DWANT_LV2=$(usex lv2)

diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index e025c0c1b438..feaf52ef9582 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=8
 
 inherit cmake flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+DESCRIPTION="Set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="https://calf-studio-gear.org/"
 
-if [[ "${PV}" = "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
@@ -18,9 +18,9 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2"
+IUSE="cpu_flags_x86_sse experimental gui jack lash lv2"
 
-REQUIRED_USE="jack? ( gtk )"
+REQUIRED_USE="jack? ( gui )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -30,7 +30,7 @@ DEPEND="
 	dev-libs/expat
 	dev-libs/glib:2
 	media-sound/fluidsynth:=
-	gtk? (
+	gui? (
 		x11-libs/cairo
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
@@ -42,6 +42,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.90.7-no-remove-ttl.patch"
+)
+
 src_configure() {
 	# Upstream append -ffast-math by default, however since libtool links C++
 	# shared libs with -nostdlib, this causes symbol resolution error for
@@ -50,7 +54,7 @@ src_configure() {
 	[[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math"
 
 	local mycmakeargs=(
-		-DWANT_GUI=$(usex gtk)
+		-DWANT_GUI=$(usex gui)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_LASH=$(usex lash)
 		-DWANT_LV2=$(usex lv2)

diff --git a/media-plugins/calf/files/calf-0.90.6-desktop-file.patch b/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
index 0472d08981cf..42c61e72177a 100644
--- a/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
+++ b/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
@@ -11,17 +11,6 @@ and not of the application.
 This also updates/fixes the `Categories` section.
 
 Fixes https://955628.bugs.gentoo.org/attachment.cgi?id=928147 .
----
- .gitignore                      | 1 -
- .svnignore                      | 1 -
- CMakeLists.txt                  | 3 +--
- calf.desktop.in => calf.desktop | 7 ++++---
- configure.ac.deprecated         | 1 -
- 5 files changed, 5 insertions(+), 8 deletions(-)
- rename calf.desktop.in => calf.desktop (95%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd723ed70..5b976127d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -200,7 +200,6 @@ else()
@@ -41,11 +30,9 @@ index bd723ed70..5b976127d 100644
          DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
  install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1
          DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-diff --git a/calf.desktop.in b/calf.desktop
 similarity index 95%
 rename from calf.desktop.in
 rename to calf.desktop
-index 3514ee874..c0a2071ac 100644
 --- a/calf.desktop.in
 +++ b/calf.desktop
 @@ -1,10 +1,11 @@

diff --git a/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch b/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch
index 8f2a2aba34d4..7b07c9c05cc5 100644
--- a/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch
+++ b/media-plugins/calf/files/calf-0.90.6-gnuinstalldirs.patch
@@ -3,13 +3,6 @@ From: Johannes Lorenz <j.git@lorenz-ho.me>
 Date: Fri, 2 May 2025 13:59:50 +0200
 Subject: [PATCH] Use GNUInstallDirs for flexible `bin`, `lib` and `doc`
 
----
- CMakeLists.txt     | 16 ++++++++--------
- src/CMakeLists.txt | 33 +++++++++++++++++----------------
- 2 files changed, 25 insertions(+), 24 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df2fde638..cfed21b69 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -210,21 +210,21 @@ add_subdirectory(icons)
@@ -42,8 +35,6 @@ index df2fde638..cfed21b69 100644
  install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop
          DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
  install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1e1cd30d9..da22ec1ab 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -3,6 +3,7 @@

diff --git a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch b/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
index 4f31f3c46f13..0a4b162213d0 100644
--- a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
+++ b/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
@@ -5,12 +5,6 @@ From: Johannes Lorenz <j.git@lorenz-ho.me>
 Date: Fri, 16 May 2025 20:54:44 +0200
 Subject: [PATCH] Fix #383: Only install lv2gui if Lv2 *and* GUI are set
 
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f8021af63..372af67a4 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -121,7 +121,7 @@ endif()

diff --git a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch b/media-plugins/calf/files/calf-0.90.7-lv2gui.patch
similarity index 64%
copy from media-plugins/calf/files/calf-0.90.6-lv2gui.patch
copy to media-plugins/calf/files/calf-0.90.7-lv2gui.patch
index 4f31f3c46f13..11d84a7d08ab 100644
--- a/media-plugins/calf/files/calf-0.90.6-lv2gui.patch
+++ b/media-plugins/calf/files/calf-0.90.7-lv2gui.patch
@@ -5,18 +5,12 @@ From: Johannes Lorenz <j.git@lorenz-ho.me>
 Date: Fri, 16 May 2025 20:54:44 +0200
 Subject: [PATCH] Fix #383: Only install lv2gui if Lv2 *and* GUI are set
 
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f8021af63..372af67a4 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -121,7 +121,7 @@ endif()
- 
- # Install libs
- install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+ install(TARGETS ${PROJECT_NAME}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
 -if(USE_GUI)
 +if(USE_LV2 AND USE_GUI)
      install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})

diff --git a/media-plugins/calf/files/calf-0.90.7-no-remove-ttl.patch b/media-plugins/calf/files/calf-0.90.7-no-remove-ttl.patch
new file mode 100644
index 000000000000..97a70abc5d92
--- /dev/null
+++ b/media-plugins/calf/files/calf-0.90.7-no-remove-ttl.patch
@@ -0,0 +1,15 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -171,12 +171,6 @@ if(USE_LV2)
+         endif()
+     endif()
+ 
+-    # Remove previous .ttl files
+-    file(GLOB ttl_files "${LV2DIR_PROJ}/*.ttl")
+-    foreach(ttl_file ${ttl_files})
+-        file(REMOVE "${ttl_file}")
+-    endforeach()
+-
+     # Install new .ttl files
+     install(CODE "execute_process(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}makerdf\" -m ttl -p \"\$ENV{DESTDIR}${LV2DIR_PROJ}\" -d \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")")
+ 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/
@ 2025-09-26 11:57 Miroslav Šulc
  0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2025-09-26 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     5ad56a5cc7a463379abaaf647dbeacb202370e41
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 11:57:30 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 11:57:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad56a5c

media-plugins/calf: dropped obsolete 0.90.7

Bug: https://bugs.gentoo.org/963391
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-plugins/calf/Manifest                        |  1 -
 media-plugins/calf/calf-0.90.7.ebuild              | 75 ----------------------
 .../calf/files/calf-0.90.6-desktop-file.patch      | 65 -------------------
 media-plugins/calf/files/calf-0.90.7-lv2gui.patch  | 18 ------
 4 files changed, 159 deletions(-)

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index dbab0a31360f..b7288e3dffa9 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,2 +1 @@
-DIST calf-0.90.7.tar.gz 16119531 BLAKE2B a9262be48c955901617aac1d1abafbe523eab5cdea6671aa87d6372eba70fedfe2e636e5f66b83cc1d9107de56ec34ed4feb1e4fbf1e1e880e005ed473b84c1d SHA512 a407566717ee31fd26e17ff1e6cd412ecf7a0abef58314c632ef08cc1d80f26e9243b363de82958eb3cc5754dc79af3a682782be0c2654f821bbbcaef9c58f3d
 DIST calf-0.90.8.tar.gz 16119457 BLAKE2B 6f154e581c69f6597d3806a779b43b0100ad53264ef50f4056efd1908892348da723eb850c78e5cfdc5eed6348799ad2340b1a5f4b77c65d3650b3d12fd54e83 SHA512 a90e4780ee9006b450525d90142f325e7d93594c875984bd2590964e9a45a68daeaa35bcc68c7c0806ba39fc28ef79250744c3406647906447ce43b238cbd432

diff --git a/media-plugins/calf/calf-0.90.7.ebuild b/media-plugins/calf/calf-0.90.7.ebuild
deleted file mode 100644
index ca03c17945f6..000000000000
--- a/media-plugins/calf/calf-0.90.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="https://calf-studio-gear.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse experimental gui jack lash lv2"
-
-REQUIRED_USE="jack? ( gui )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth:=
-	gui? (
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# pending upstream PRs:
-	"${FILESDIR}/${PN}-0.90.6-desktop-file.patch" # bug 955628
-	"${FILESDIR}/${PN}-0.90.7-lv2gui.patch" # bug 954142
-	"${FILESDIR}/${PN}-0.90.7-no-remove-ttl.patch"
-)
-
-src_configure() {
-	# Upstream append -ffast-math by default, however since libtool links C++
-	# shared libs with -nostdlib, this causes symbol resolution error for
-	# __powidn2 when using compiler-rt. Disable fast math on compiler-rt until
-	# a better fix is found.
-	[[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math"
-
-	local mycmakeargs=(
-		-DWANT_GUI=$(usex gui)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LV2=$(usex lv2)
-		-DWANT_LV2_GUI=$(usex lv2)
-		-DWANT_SORDI=ON
-		-DWANT_EXPERIMENTAL=$(usex experimental)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	mv "${ED}"/usr/share/bash-completion/completions/calf \
-		"${ED}"/usr/share/bash-completion/completions/calfjackhost || die "Failed to install bash completion"
-}

diff --git a/media-plugins/calf/files/calf-0.90.6-desktop-file.patch b/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
deleted file mode 100644
index 0472d08981cf..000000000000
--- a/media-plugins/calf/files/calf-0.90.6-desktop-file.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: https://github.com/calf-studio-gear/calf/pull/385
-
-From c88956484bc06cc3192303b71a6f4907d5ea34c5 Mon Sep 17 00:00:00 2001
-From: Johannes Lorenz <j.git@lorenz-ho.me>
-Date: Sat, 17 May 2025 16:26:03 +0200
-Subject: [PATCH] Fix calf.desktop
-
-The `Version` must be the "Version of the Desktop Entry Specification",
-and not of the application.
-
-This also updates/fixes the `Categories` section.
-
-Fixes https://955628.bugs.gentoo.org/attachment.cgi?id=928147 .
----
- .gitignore                      | 1 -
- .svnignore                      | 1 -
- CMakeLists.txt                  | 3 +--
- calf.desktop.in => calf.desktop | 7 ++++---
- configure.ac.deprecated         | 1 -
- 5 files changed, 5 insertions(+), 8 deletions(-)
- rename calf.desktop.in => calf.desktop (95%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd723ed70..5b976127d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -200,7 +200,6 @@ else()
- endif()
- 
- configure_file(config.h.cmake.in config.h)
--configure_file(${PROJECT_NAME}.desktop.in ${PROJECT_NAME}.desktop)
- include_directories(${CMAKE_BINARY_DIR})
- 
- #
-@@ -231,7 +230,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts/
-         DESTINATION ${CMAKE_INSTALL_DOCDIR}/scripts FILES_MATCHING PATTERN "*.js")
- install(DIRECTORY ${CMAKE_SOURCE_DIR}/sf2/
-         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2")
--install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop
-+install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.desktop
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
- install(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}jackhost.1
-         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-diff --git a/calf.desktop.in b/calf.desktop
-similarity index 95%
-rename from calf.desktop.in
-rename to calf.desktop
-index 3514ee874..c0a2071ac 100644
---- a/calf.desktop.in
-+++ b/calf.desktop
-@@ -1,10 +1,11 @@
- [Desktop Entry]
--Categories=Application;AudioVideo;Audio;GNOME
-+Type=Application
-+Version=1.5
-+
-+Categories=AudioVideo;Audio;Sequencer;X-Jack;GTK
- Exec=calfjackhost
- Icon=calf
- Terminal=false
--Type=Application
--Version=@VERSION@
- 
- Name=Calf Plugin Pack for JACK
- Name[fr]=Ensemble de greffons Calf pour JACK

diff --git a/media-plugins/calf/files/calf-0.90.7-lv2gui.patch b/media-plugins/calf/files/calf-0.90.7-lv2gui.patch
deleted file mode 100644
index 11d84a7d08ab..000000000000
--- a/media-plugins/calf/files/calf-0.90.7-lv2gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: https://github.com/calf-studio-gear/calf/pull/384
-
-From 4f6adaa9bea90bfceaca02334a1a9f1642016444 Mon Sep 17 00:00:00 2001
-From: Johannes Lorenz <j.git@lorenz-ho.me>
-Date: Fri, 16 May 2025 20:54:44 +0200
-Subject: [PATCH] Fix #383: Only install lv2gui if Lv2 *and* GUI are set
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -121,7 +121,7 @@ endif()
- install(TARGETS ${PROJECT_NAME}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
--if(USE_GUI)
-+if(USE_LV2 AND USE_GUI)
-     install(TARGETS ${PROJECT_NAME}lv2gui DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
- endif()
- 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2025-09-26 11:57 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-03  8:53 [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2025-09-26 11:57 Miroslav Šulc
2025-06-07 19:36 Miroslav Šulc
2025-06-02 15:19 Andreas Sturmlechner
2024-12-07 13:58 Miroslav Šulc
2023-09-22 15:44 Sam James
2023-09-22 15:44 Sam James
2021-04-13 22:37 Sam James
2021-03-27  2:58 Sam James
2019-04-06 20:47 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox