From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- media-plugins/calf/Manifest | 3 +- media-plugins/calf/calf-0.90.3.ebuild | 1 + .../calf/files/calf-0.90.3-slibtool.patch | 118 +++++++++++++++++++++ 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 media-plugins/calf/files/calf-0.90.3-slibtool.patch (limited to 'media-plugins/calf') diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index d389dc60569b..a46315e57edb 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1,7 +1,8 @@ AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48 AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f +AUX calf-0.90.3-slibtool.patch 6284 BLAKE2B 17d52b66524ddbe5c9fdaa3f39a850a115068cc53d2bd6feb85df4962c9585a05188b39df60fa647242ee2b0ca1610cf6e02fdcb77af6336f1acc1b3ca9817dd SHA512 11db5f699b25ee858b16548400f21782f0c96fa7c928f5d4fda7b28cdbf46a7e936c8075b18ca615d36c5c94894162b26f906dd7da1b5b19d88a47cfd926ef55 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7 -EBUILD calf-0.90.3.ebuild 1658 BLAKE2B b0cbca070fd998a80c844b05b876fbafa6890723eb792411328b61cc87d58be46f4bc8566e9c3be063f60f7e5dfffe55c92e64cf507589bf7a070470415eca7d SHA512 a4f3a18368c695b588feabb64cce1966e839dbee288d43501790b252dd64e45669004335f15bc53240790b14df5a618bee5e87061b86d75f625295a58d00a164 +EBUILD calf-0.90.3.ebuild 1701 BLAKE2B 61de7c6263b23a9f640193636ff92a2dc1564a456364af0accdace4ebf00afd37e9f215f365fafd85cb2d09ba1ced96bf48e601752f0ad73ab15ef65b94f1f43 SHA512 d8b993b3fa10288b070f812559bcf676a13fff7ace2e4e8d51f4ad41ffdb613255e6d9c19cbbeb56d76abcc6c16720880130356fbb3c8190106ea7adbbc1b0c9 EBUILD calf-9999.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3.ebuild index c459fd25c342..ca5c968e7df3 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 000000000000..35a4c4ee9412 --- /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 +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 +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 -- cgit v1.2.3