* [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; 5+ 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] 5+ 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; 5+ 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] 5+ 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; 5+ 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] 5+ 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; 5+ 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] 5+ 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; 5+ 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] 5+ messages in thread
end of thread, other threads:[~2023-09-22 15:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-27 2:58 [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/, media-plugins/calf/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-09-22 15:44 Sam James
2023-09-22 15:44 Sam James
2021-04-13 22:37 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