gentoo auto-resync : 06:06:2023 - 09:39:05

5 files changed, 49 insertions, 5 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index db014e8711a6..b2c7f0918a68 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,6 @@
-AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
+AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
+AUX ardour-7.4-libc++.patch 1417 BLAKE2B d3e3b94a0d6f6a1b5ce9af18d6a014e46c12cecaf307f6cd6beac4143b0280bd708de9360ebe0a584fdc28a25e831abc39f0d26d073db39a3d51e607b9fc8f41 SHA512 40f1c8671304d855b4ea7e3a30e18d33e62669b12da1bae4b8f317aa90d3a9c85900ed5467c1722a3b01b1a72971fa74f353623e16100f4e22ce0b6daa7e3b6c
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
-EBUILD ardour-7.4-r2.ebuild 4993 BLAKE2B 71bbc532229a483cb822c9e3d84123feaa1720c08655b2ae64be3bf872ab88b7d5e32955bf457026e98d721736eb65f658a0bfe4bbc6a0acb98438c5d30938d6 SHA512 dfe27a9baf9b748af9bb5a7f77963ec41a623b78df4c62e029dbcbdccf0f18d3339741227c60086d37620cc61d29fd7222a6fc557e793fec3c4b3afea8f21ed4
-EBUILD ardour-9999.ebuild 4995 BLAKE2B 7185e40173864410eb0b913ac1f8dac790b16c4bf5a85d79c9c49c0c273bafab156c41db648f118afa19b87c41e065a70ec13056341bb258254496c654025000 SHA512 be40fe998b330347b5c0bbdc34cec6fbb652e60ee1edc00dab467a52b5ed60f28b2d511a7fead485a8949796937ab568fc55751fa4c564df37e693d53bf367aa
+EBUILD ardour-7.4-r2.ebuild 5101 BLAKE2B 53d6fe2967a668d8d99c8f413b8c63438d72e67a05737c5ed45f5a0cc32c1f38a71660157eeb782686aa773cea4074997baa9c21e9ea8065532517ee988249c8 SHA512 3fa6ce860d63ee3de50aa6b2a87f68df03dc33c0ad8fcd4fa90971367808fbd5a0f7b8baf125ffb51d9685b05984fb2ef46c2b47db155c028144bba9d8894d73
+EBUILD ardour-9999.ebuild 5103 BLAKE2B 7116550a57e907307d7e65d88225d4a23f91a158d871a7e09dc1b5ea67aeb11b8ba86b697ccf99f1068b9bf57ffada937dbda19e9b029c61c022b2fab92a9a56 SHA512 d98153ad777228d05450e85d8cb0505d2883c87275e828944eb69433eaa7128ef568cbf8a9d42b1192e61b2cb4e1706c133c864f8440dc32b12b941cb789f059
 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-r2.ebuild
index 7393250c576f..2bfcbebca1ea 100644
--- a/media-sound/ardour/ardour-7.4-r2.ebuild
+++ b/media-sound/ardour/ardour-7.4-r2.ebuild
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.8-metadata.patch"
+	"${FILESDIR}/${PN}-7.4-libc++.patch"
 )
 
 pkg_pretend() {
@@ -145,6 +146,8 @@ 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 0d0ba16716f4..93b6a1742f84 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.8-metadata.patch"
+	"${FILESDIR}/${PN}-7.4-libc++.patch"
 )
 
 pkg_pretend() {
@@ -145,6 +146,8 @@ 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-6.8-metadata.patch b/media-sound/ardour/files/ardour-6.8-metadata.patch
index fa7b6e121197..ea540b34df5f 100644
--- a/media-sound/ardour/files/ardour-6.8-metadata.patch
+++ b/media-sound/ardour/files/ardour-6.8-metadata.patch
@@ -1,5 +1,3 @@
-diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
-index f5d0533..a68cb3f 100644
 --- a/gtk2_ardour/wscript
 +++ b/gtk2_ardour/wscript
 @@ -943,7 +943,7 @@ def build(bld):
diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch
new file mode 100644
index 000000000000..85f13ba47dbc
--- /dev/null
+++ b/media-sound/ardour/files/ardour-7.4-libc++.patch
@@ -0,0 +1,39 @@
+From d8e42490b18bd0c8a827d96608e951bf5bc875e4 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
+
+--- a/libs/vst3/pluginterfaces/base/funknown.cpp
++++ b/libs/vst3/pluginterfaces/base/funknown.cpp
+@@ -44,7 +44,9 @@
+ #endif
+ 
+ #if SMTG_OS_LINUX
++#ifndef USE_LIBCXX
+ #include <ext/atomicity.h>
++#endif
+ /* UUID */
+ #include <string>
+ #include <boost/uuid/uuid.hpp>
+@@ -83,7 +85,7 @@ int32 PLUGIN_API atomicAdd (int32& var, int32 d)
+ 	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