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 --- ...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 +++++++++++++ 4 files changed, 129 insertions(+) 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/files') 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