From 820b3cf4687f358703c643bacf3e5a06ccfa4402 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Sep 2023 23:18:20 +0100 Subject: gentoo auto-resync : 22:09:2023 - 23:18:20 --- media-plugins/calf/Manifest | 8 +- media-plugins/calf/calf-0.90.3-r1.ebuild | 76 ------------------- media-plugins/calf/calf-0.90.3-r2.ebuild | 85 ++++++++++++++++++++++ media-plugins/calf/calf-9999.ebuild | 12 ++- ...0.90.3-clang-lerp_table_lookup_float_mask.patch | 45 ++++++++++++ .../files/calf-0.90.3-fix-build-with-lld.patch | 26 +++++++ .../files/calf-0.90.3-replace-std-bind2nd.patch | 32 ++++++++ .../calf/files/calf-9999-fix-build-with-lld.patch | 26 +++++++ 8 files changed, 230 insertions(+), 80 deletions(-) delete mode 100644 media-plugins/calf/calf-0.90.3-r1.ebuild create mode 100644 media-plugins/calf/calf-0.90.3-r2.ebuild create mode 100644 media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch create mode 100644 media-plugins/calf/files/calf-0.90.3-fix-build-with-lld.patch create mode 100644 media-plugins/calf/files/calf-0.90.3-replace-std-bind2nd.patch create mode 100644 media-plugins/calf/files/calf-9999-fix-build-with-lld.patch (limited to 'media-plugins/calf') diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index ee7dde1374b8..aaa79714d405 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1,7 +1,11 @@ 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-clang-lerp_table_lookup_float_mask.patch 2113 BLAKE2B 1535459a82b14ba1da3c9454886a9f8f418553aa15e8aed6f32b86cb62d10a48726e5c4e4be60edbff0d0b7dee9d59d1c5ad109489e6fdc0dbbf1c088d2e6761 SHA512 cff8f754db8bbe35f71c9f5b371a3551b58afff67a8dc5b4a688aac00c06a19fd72d269f0e7cf1503c09fcbc7288b477e8033e95b0cfba4ed9edb5bb5835112b +AUX calf-0.90.3-fix-build-with-lld.patch 1108 BLAKE2B 6b0d5c5c7b48c788c78141474ad7ea51ee918d4e43c9a3e434ff9fc85d08c0be89b269361fe3c95002d8ba80fc722d3c9e7abaf91191e09430ff49550b4e1466 SHA512 bd34719dac409bee20a5ed8af80066bd08691a086b1720ebd170d498f53eb9463ee09f1c9fedf6794919bea14914697791a6e9fa0da92861e782a258cf74f74c +AUX calf-0.90.3-replace-std-bind2nd.patch 1222 BLAKE2B f14eba2affa8a15217e6afa980c8000ae2b13f6c232b9bd4e5c60ef0492c1fd450d91d2def85f4b1cd6a59d8bd47c5263ab64c7bdb91a906d0131d2ec0243cc3 SHA512 07a136c8bbeb8b2c03d87c9fca7c209a371a895c3a0e34d35ffd68e82f656a7953b8a60c3b2e4a4767315d0c9becf4bdef5daf05924d86311e0027ee076d84c6 +AUX calf-9999-fix-build-with-lld.patch 1117 BLAKE2B 8970b0da8df3dfec7145e9649d58bb353f804adeda041826b50cbe58f8a791cd500cd549c42d251788fdcdc3b6f44cc04130a922a2bbad823bacd564f8933af2 SHA512 7e150047e2966339b5c2f59ce7c0255c150315ba55ded0c694c4e69ff2b9f35ce09a4de51fb46b40443e728b00195dd7d0d1e64bf504412a3c0d00f20fb5a92e DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7 -EBUILD calf-0.90.3-r1.ebuild 1659 BLAKE2B a08fe6713503eb8cda99eda0ef807202358e780766ce6793cd858c40779eb115241b9ca74c739ada6c165da195fd96da8d0e8adb772355891e366837cc207c15 SHA512 3309974bfb35a4916227e148888cf5b0408fe6879c8a66b77a7d9b844abb1ecc77b5b67fd157a72188fbdc307c3cd193b1b35382586c24d463be1fd37ee5878b -EBUILD calf-9999.ebuild 1637 BLAKE2B ef3714d67a1ae6199111c869776749bac3b7d1dbcb2fe11b7301eaec8454d359927384d92855011a99ed8721b10d24f68d5aa77e1cbc6dc1b93d2bfc86d91607 SHA512 b5b4cdc2ab42de96ac2fb8d45afb8013a25a2ab29fefe9b94fd9a7ba4d248794f77fcb813736c2e5add6c34faa09c76ffc28aa747145ea4191e90703d3434560 +EBUILD calf-0.90.3-r2.ebuild 2218 BLAKE2B 178586e59c7317de09b8218d6b11d884ebefb34605cce89dbb2059417f4dd96c05344fe3e125326041735eaddc41d610ca965a546040f6e56da3f89719bdc5e1 SHA512 a914053b3e59a4bb6c63d578dd66935ac69ae6ee91ee6d12d4a9c5783dfed88f4228448e419e5a204b1ed6f7336f9cd9de02728be140f62c04d5a3a60bd78067 +EBUILD calf-9999.ebuild 2124 BLAKE2B 7acc356df42a50a438413abbb33b7a01dc7668f02567ccdae26a19a2745b5d9dd6fa3a81ca12e9da705f012d9c518b8be2bad5d4e84cee02b2bb62b5854d4c0f SHA512 9d7e4a4aa6f7c2125176a01b99a7e15c377aded7759aef5d99c29b7b52ff1d7d54423b5d9c904ce2bae4aac2f1ec34676f31bd6e96cd01ea0a9c8597d47473cf MISC metadata.xml 501 BLAKE2B 652333b064998e6eb587ed88e4a4077a40f4af372a013315b525592b1941f7dcc970abef652458745a44b3ec4855d90baba4b20f55c7f965fe8aa0a94e2012e4 SHA512 4cd55fe0e520bc564b09d9734c56ce104fd20c82c18cc2f862d7e09793eea9590a08879902a0ac915b43f4fc8bd583a338027b1b8a55b6a34639cd78f5a68ffb diff --git a/media-plugins/calf/calf-0.90.3-r1.ebuild b/media-plugins/calf/calf-0.90.3-r1.ebuild deleted file mode 100644 index f0c3d8cae4e9..000000000000 --- a/media-plugins/calf/calf-0.90.3-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools 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=" - dev-libs/atk - 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" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - 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.3-r2.ebuild b/media-plugins/calf/calf-0.90.3-r2.ebuild new file mode 100644 index 000000000000..1c0266945303 --- /dev/null +++ b/media-plugins/calf/calf-0.90.3-r2.ebuild @@ -0,0 +1,85 @@ +# 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-9999.ebuild b/media-plugins/calf/calf-9999.ebuild index ac7a768dcf5c..f17d2973cb01 100644 --- a/media-plugins/calf/calf-9999.ebuild +++ b/media-plugins/calf/calf-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools xdg +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/" @@ -26,7 +26,7 @@ BDEPEND=" virtual/pkgconfig " DEPEND=" - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth:= @@ -46,6 +46,8 @@ 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" + "${FILESDIR}/${PN}-0.90.3-replace-std-bind2nd.patch" ) src_prepare() { @@ -54,6 +56,12 @@ src_prepare() { } 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 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 new file mode 100644 index 000000000000..d868fb8e1f33 --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.3-clang-lerp_table_lookup_float_mask.patch @@ -0,0 +1,45 @@ +From bfb857445e72230659493d3491970e3cb3c7eb9a Mon Sep 17 00:00:00 2001 +From: Krzysztof Foltman +Date: Fri, 2 Aug 2019 20:55:50 +0100 +Subject: [PATCH] Compatibility: A possible fix for the clang++-8 issue. + +--- + src/calf/fixed_point.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/calf/fixed_point.h b/src/calf/fixed_point.h +index 7dbf5c9bc..63bfce167 100644 +--- a/src/calf/fixed_point.h ++++ b/src/calf/fixed_point.h +@@ -215,7 +215,7 @@ template class fixed_point { + } + + template +- inline U lerp_table_lookup_int(U data[(1U<(data[pos], data[pos+1]); + } +@@ -223,19 +223,19 @@ template 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 +- inline U lerp_table_lookup_int_shift(U data[(1U<(data[pos], data[pos+1]); + } + + template +- inline U lerp_table_lookup_float(U data[(1U< +- inline U lerp_table_lookup_float_mask(U data[(1U< +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 +--- 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 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 +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 +--- a/src/calf/orfanidis_eq.h ++++ b/src/calf/orfanidis_eq.h +@@ -748,7 +748,7 @@ private: + std::vector v = landen(k, tol); + + std::transform(v.begin(), v.end(), v.begin(), +- bind2nd(std::plus(), 1.0)); ++ bind(std::plus(), 1.0, std::placeholders::_1)); + + K = std::accumulate(v.begin(), v.end(), + 1, std::multiplies()) * M_PI/2.0; +@@ -764,7 +764,7 @@ private: + std::vector vp = landen(kp, tol); + + std::transform(vp.begin(), vp.end(), vp.begin(), +- bind2nd(std::plus(), 1.0)); ++ bind(std::plus(), 1.0, std::placeholders::_1)); + + Kprime = std::accumulate(vp.begin(), vp.end(), + 1.0, std::multiplies()) * M_PI/2.0; +-- +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 +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 +--- 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 + -- cgit v1.2.3