From 3c246ed172bd795a519ba659ba32c9e91f6bedde Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 23 Sep 2023 23:21:09 +0100
Subject: gentoo auto-resync : 23:09:2023 - 23:21:08

---
 media-sound/Manifest.gz                          | Bin 57439 -> 57433 bytes
 media-sound/ardour/Manifest                      |   4 ++--
 media-sound/ardour/ardour-9999.ebuild            |   1 -
 media-sound/ardour/files/ardour-7.4-libc++.patch |  12 ++++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'media-sound')

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9e9070704f3a..4ea0b6d0b31a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 320c98adf532..a4151e69c193 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 1519 BLAKE2B 77f6f35301b7eb3b04cc4287344ed6da1521470fb1e8e5fc006ba505b8ebcfc044d03c4f91a9992f4b737228984009fd0114109c9e9dbf6ac22a1fb7226138a0 SHA512 da3e4ccf54f24aace189aa717d0ed91cd559956d86e7c8e9f2f6f52b3aeed54b71e27393ca17616c112cc311e99c376b36030a49260eacb77826a26e4d1f1543
+AUX ardour-7.4-libc++.patch 1494 BLAKE2B 8cd7d973e098fe3dce358208f13c3f11076dbf24308f67a3964c458346d1a90d1a7d77ab03b1b092219ad7f729f248b880d166807e84ccdae1916076fa307ec6 SHA512 927999c2a74fb4e557c17931c559790af8bab9dbfd074ef4ea22c44649b1f5c823ee5e1c67a22f393aff7020db3a45040078b6a769d130a0fc62c85729dc0366
 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-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
+EBUILD ardour-9999.ebuild 5002 BLAKE2B c4052f57e6ee968fec8ee150c07df8afb44919a27256bcef558c5aa2be0e1bd3f701d3a2c63b34789c06a3e293ff08733be9dfdac1148a3aec05a594da99bd09 SHA512 1d455a82abaa6e17c8910839ab39848acb8347b61cf819d298e300b462259b4365a2504206ad13571505b4ec84241417f5786016918fe0b4611889cdc1984865
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 029d71ed7696..6416faf2f9b8 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -73,7 +73,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-7.4-libc++.patch"
 )
 
 pkg_pretend() {
diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch
index a596fafba0f7..44d8b2ccca47 100644
--- a/media-sound/ardour/files/ardour-7.4-libc++.patch
+++ b/media-sound/ardour/files/ardour-7.4-libc++.patch
@@ -13,9 +13,9 @@ Signed-off-by: Violet Purcell <vimproved@inventati.org>
  #endif
  
  #if SMTG_OS_LINUX
-+#if !defined (SMTG_USE_STDATOMIC_H)
++#if !defined (SMTG_USE_ATOMIC)
 +#if defined (_LIBCPP_VERSION)
-+#define SMTG_USE_STDATOMIC_H 1
++#define SMTG_USE_ATOMIC 1
 +#else
  #include <ext/atomicity.h>
 +#endif
@@ -26,8 +26,8 @@ Signed-off-by: Violet Purcell <vimproved@inventati.org>
  #include <boost/uuid/uuid_generators.hpp>
  #endif
  
-+#if defined (SMTG_USE_STDATOMIC_H) && SMTG_USE_STDATOMIC_H
-+#include <stdatomic.h>
++#if defined (SMTG_USE_ATOMIC) && SMTG_USE_ATOMIC
++#include <atomic>
 +#endif
 +
  namespace Steinberg {
@@ -38,8 +38,8 @@ Signed-off-by: Violet Purcell <vimproved@inventati.org>
  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;
++#if SMTG_USE_ATOMIC
++	return atomic_fetch_add (reinterpret_cast<std::atomic_int_least32_t*> (&var), d) +d;
 +#elif SMTG_OS_WINDOWS
  	return InterlockedExchangeAdd ((volatile long int*)&var, d) + d;
  #elif SMTG_OS_MACOS
-- 
cgit v1.2.3