summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-13 21:57:38 +0000
committerSam James <sam@gentoo.org>2021-04-13 22:37:40 +0000
commitac4548716579aa4098ab08dc74b89a4f4ad0a88b (patch)
tree1c7900252c5bb855be0e0d355db8eafac92f075e
parentapp-admin/syslog-ng: use pkgconfig to find libesmtp (diff)
downloadgentoo-ac4548716579aa4098ab08dc74b89a4f4ad0a88b.tar.gz
gentoo-ac4548716579aa4098ab08dc74b89a4f4ad0a88b.tar.bz2
gentoo-ac4548716579aa4098ab08dc74b89a4f4ad0a88b.zip
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@gentoo.org>
-rw-r--r--media-plugins/calf/calf-0.90.3-r1.ebuild (renamed from media-plugins/calf/calf-0.90.3.ebuild)1
-rw-r--r--media-plugins/calf/files/calf-0.90.3-slibtool.patch118
2 files changed, 0 insertions, 119 deletions
diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/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