gentoo auto-resync : 20:10:2023 - 09:50:23

4 files changed, 9 insertions, 23 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a7cefa18cb98..f7a1f9d4bc01 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index aaa79714d405..195ddeadf5da 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -4,8 +4,8 @@ AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfb
 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
+AUX calf-9999-fix-build-with-lld.patch 677 BLAKE2B df90347e7caee64c2c431bdc1e40ab67732f564a1aeb1f986a327980a12fbe7669fbe32b288fccb6fe2e2cc9760e031d505c9e1143e78f8c136ca0b1e9a05157 SHA512 3859eb18b95543087bdf509611a54951a64fc02e691217038c2a0c95e42c9e2d11f7a1a96ceb6f02614afaa8a9697e5eedbe0c26a759011d7003b48d75772afe
 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
 EBUILD calf-0.90.3-r2.ebuild 2218 BLAKE2B 178586e59c7317de09b8218d6b11d884ebefb34605cce89dbb2059417f4dd96c05344fe3e125326041735eaddc41d610ca965a546040f6e56da3f89719bdc5e1 SHA512 a914053b3e59a4bb6c63d578dd66935ac69ae6ee91ee6d12d4a9c5783dfed88f4228448e419e5a204b1ed6f7336f9cd9de02728be140f62c04d5a3a60bd78067
-EBUILD calf-9999.ebuild 2124 BLAKE2B 7acc356df42a50a438413abbb33b7a01dc7668f02567ccdae26a19a2745b5d9dd6fa3a81ca12e9da705f012d9c518b8be2bad5d4e84cee02b2bb62b5854d4c0f SHA512 9d7e4a4aa6f7c2125176a01b99a7e15c377aded7759aef5d99c29b7b52ff1d7d54423b5d9c904ce2bae4aac2f1ec34676f31bd6e96cd01ea0a9c8597d47473cf
+EBUILD calf-9999.ebuild 2070 BLAKE2B 1cbe41f893300b6c48f7b7c36937e15f64d6583ef02e425431bad9f076b7effacc0d72024e902f240ad901f7b325811823f0f9a0b2c72abca9b31c97ee431e64 SHA512 26cc76d208f3c2cfa887d1bc8c0dad9826207971ee94067838529122cedd753dee87b11ab7c1379976bbf2468c72bd920613db10898bf48f9771ef8f7aa08fe8
 MISC metadata.xml 501 BLAKE2B 652333b064998e6eb587ed88e4a4077a40f4af372a013315b525592b1941f7dcc970abef652458745a44b3ec4855d90baba4b20f55c7f965fe8aa0a94e2012e4 SHA512 4cd55fe0e520bc564b09d9734c56ce104fd20c82c18cc2f862d7e09793eea9590a08879902a0ac915b43f4fc8bd583a338027b1b8a55b6a34639cd78f5a68ffb
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index f17d2973cb01..644ca320f2ee 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -47,7 +47,6 @@ 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-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
index 816da77f7d0d..acd196f6edd2 100644
--- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
+++ b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
@@ -1,26 +1,13 @@
-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>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6f11628b..0e775bef 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -42,7 +42,7 @@ libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
+@@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp
  if USE_DEBUG
- libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
+ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
  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
+-libcalflv2gui_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 $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
+ endif
  endif
  
- if USE_LV2_GUI
--- 
-2.42.0
-