gentoo auto-resync : 22:09:2023 - 23:18:20

5 files changed, 37 insertions, 33 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 09ff4605778c..320c98adf532 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,8 @@
 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
-AUX ardour-7.4-libc++.patch 1417 BLAKE2B d3e3b94a0d6f6a1b5ce9af18d6a014e46c12cecaf307f6cd6beac4143b0280bd708de9360ebe0a584fdc28a25e831abc39f0d26d073db39a3d51e607b9fc8f41 SHA512 40f1c8671304d855b4ea7e3a30e18d33e62669b12da1bae4b8f317aa90d3a9c85900ed5467c1722a3b01b1a72971fa74f353623e16100f4e22ce0b6daa7e3b6c
+AUX ardour-7.4-libc++.patch 1519 BLAKE2B 77f6f35301b7eb3b04cc4287344ed6da1521470fb1e8e5fc006ba505b8ebcfc044d03c4f91a9992f4b737228984009fd0114109c9e9dbf6ac22a1fb7226138a0 SHA512 da3e4ccf54f24aace189aa717d0ed91cd559956d86e7c8e9f2f6f52b3aeed54b71e27393ca17616c112cc311e99c376b36030a49260eacb77826a26e4d1f1543
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
-EBUILD ardour-7.4-r2.ebuild 5101 BLAKE2B 53d6fe2967a668d8d99c8f413b8c63438d72e67a05737c5ed45f5a0cc32c1f38a71660157eeb782686aa773cea4074997baa9c21e9ea8065532517ee988249c8 SHA512 3fa6ce860d63ee3de50aa6b2a87f68df03dc33c0ad8fcd4fa90971367808fbd5a0f7b8baf125ffb51d9685b05984fb2ef46c2b47db155c028144bba9d8894d73
-EBUILD ardour-7.5.ebuild 5109 BLAKE2B 1d64b458b4c7627a8f4c6274b6b0990c2c044a2a00bdebb6e6964faf48d9b0e89f9103dbaeda68e166e2b740fae4976426c7cc58536a474598cc6ed92db46d75 SHA512 7b92eaeee7d66f670c0085e041a25af68179765f902a8d0502104d265a2e94d5929454c7d2ecac6450d549bd3e7d16e54f4cea65ca4d7802e5ed6d6abc4202d8
-EBUILD ardour-9999.ebuild 5110 BLAKE2B 7c1e4facefccf0c21411d8a665e965c827790530b1e341b000e7a3800965ba5166976c8216ea0bbc8add53b62f81b2518f9286a82c5d3a61a3486b6df8c226cd SHA512 00b912f1df0df597d66d6694c7fe87991edeb8687bb3b1215d58f98fd48d0d19a2022fb815cdb03656f6def55ced6394436269b56f8da7ec1035ad4d87839b03
+EBUILD ardour-7.4-r3.ebuild 5031 BLAKE2B 35c7aec6ac5425f5497702322b18f45a5a26dfe855e9b5af833ad044956f5afb54c1f8a23b76c839f7a3390ddca007d965633b07c89b48f41126c2a0b037886d SHA512 8da9e699c0789f7ab157be0c925be7fb907922b59ea485c050c4505266db4460ea512f3f1e527543f6befa330224f47e423e0a4f9461f5fb806ead3c390f7991
+EBUILD ardour-7.5-r1.ebuild 5039 BLAKE2B e6400b18926a0e6d6559a49beb9e22612ce2be62eab1e7e33410f26a2cefe7817437a7fe9e39b7c7c537bfb6b464b4b5fee386be2bf903ecebb38fcc474b3ca1 SHA512 dae8b3300fa79f979082631e7b3120e61a2ce1e0f5b8bb9c618d664b7698b8e512559efa79eae65dbae242ae2e07b1d7ce44eeaa166e9a950af48534ace3c716
+EBUILD ardour-9999.ebuild 5040 BLAKE2B 33067b4af30ff09d223aec49302886790d1fd0d0d35a3d07efe4aa1fadbbd9738df6d18c70efb0a15eb04feb9de885873b74cedb8fc949208f971efc015bc8da SHA512 37a88375879e3bc2223496722c1aa217f8c4ba6a8175b48a295c741b3e0a55bbc2b243cbbe81df601688778a3426830f6a1a05e0d6086498a822456571274160
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-7.4-r2.ebuild b/media-sound/ardour/ardour-7.4-r3.ebuild
index 2bfcbebca1ea..0fee9b81252e 100644
--- a/media-sound/ardour/ardour-7.4-r2.ebuild
+++ b/media-sound/ardour/ardour-7.4-r3.ebuild
@@ -146,8 +146,6 @@ src_configure() {
 		# not possible right now  --use-external-libs
 	)
 
-	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
 	waf-utils_src_configure "${myconf[@]}"
 }
 
diff --git a/media-sound/ardour/ardour-7.5.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index 2bef74d90d7e..e012233b45d4 100644
--- a/media-sound/ardour/ardour-7.5.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -146,8 +146,6 @@ src_configure() {
 		# not possible right now  --use-external-libs
 	)
 
-	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
 	waf-utils_src_configure "${myconf[@]}"
 }
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 607dfeed3930..029d71ed7696 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -146,8 +146,6 @@ src_configure() {
 		# not possible right now  --use-external-libs
 	)
 
-	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
 	waf-utils_src_configure "${myconf[@]}"
 }
 
diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch
index 85f13ba47dbc..a596fafba0f7 100644
--- a/media-sound/ardour/files/ardour-7.4-libc++.patch
+++ b/media-sound/ardour/files/ardour-7.4-libc++.patch
@@ -1,39 +1,49 @@
-From d8e42490b18bd0c8a827d96608e951bf5bc875e4 Mon Sep 17 00:00:00 2001
+From https://github.com/Ardour/ardour/pull/822/commits/c2ac82bfbacc583c49b306826dedec754633bbe7 Mon Sep 17 00:00:00 2001
 From: Violet Purcell <vimproved@inventati.org>
-Date: Sun, 4 Jun 2023 04:56:58 -0400
-Subject: [PATCH] Fix build with libc++ on linux
+Date: Thu, 21 Sep 2023 21:09:30 -0400
+Subject: [PATCH] Backport VST3 libc++ fix on linux
 
+LLVM libc++ does not have the ext/atomicity.h header. This fix is copied
+from the upstream vst3_pluginterfaces repo.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
 --- a/libs/vst3/pluginterfaces/base/funknown.cpp
 +++ b/libs/vst3/pluginterfaces/base/funknown.cpp
-@@ -44,7 +44,9 @@
+@@ -44,13 +44,23 @@
  #endif
  
  #if SMTG_OS_LINUX
-+#ifndef USE_LIBCXX
++#if !defined (SMTG_USE_STDATOMIC_H)
++#if defined (_LIBCPP_VERSION)
++#define SMTG_USE_STDATOMIC_H 1
++#else
  #include <ext/atomicity.h>
 +#endif
++#endif
  /* UUID */
  #include <string>
  #include <boost/uuid/uuid.hpp>
-@@ -83,7 +85,7 @@ int32 PLUGIN_API atomicAdd (int32& var, int32 d)
+ #include <boost/uuid/uuid_generators.hpp>
+ #endif
+ 
++#if defined (SMTG_USE_STDATOMIC_H) && SMTG_USE_STDATOMIC_H
++#include <stdatomic.h>
++#endif
++
+ namespace Steinberg {
+ 
+ //------------------------------------------------------------------------
+@@ -79,7 +89,9 @@ namespace FUnknownPrivate {
+ //------------------------------------------------------------------------
+ int32 PLUGIN_API atomicAdd (int32& var, int32 d)
+ {
+-#if SMTG_OS_WINDOWS
++#if SMTG_USE_STDATOMIC_H
++	return atomic_fetch_add (reinterpret_cast<atomic_int_least32_t*> (&var), d) +d;
++#elif SMTG_OS_WINDOWS
  	return InterlockedExchangeAdd ((volatile long int*)&var, d) + d;
  #elif SMTG_OS_MACOS
  	return OSAtomicAdd32Barrier (d, (int32_t*)&var);
--#elif SMTG_OS_LINUX
-+#elif SMTG_OS_LINUX && !defined USE_LIBCXX
- 	__gnu_cxx::__atomic_add (&var, d);
- 	return var;
- #else
---- a/wscript
-+++ b/wscript
-@@ -545,6 +545,8 @@ int main() { return 0; }''',
-     if opt.use_libcpp or conf.env['build_host'] in [ 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]:
-         cxx_flags.append('--stdlib=libc++')
-         linker_flags.append('--stdlib=libc++')
-+        if platform == 'linux':
-+            cxx_flags.append('-DUSE_LIBCXX')
- 
-     if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura' ]:
-         conf.check_cxx(cxxflags=["-std=c++11"])
 -- 
-2.40.1
+2.42.0
+