commit: ebed4d88e0d42a34cf0090463f28b78f1702f593 Author: Violet Purcell <vimproved <AT> inventati <DOT> org> AuthorDate: Sat Sep 23 17:54:37 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 23 19:38:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebed4d88
media-sound/ardour: Fix libc++ patch Fix libc++ patch and remove from 9999. Upstream-PR: https://github.com/Ardour/ardour/pull/824 Signed-off-by: Violet Purcell <vimproved <AT> inventati.org> Closes: https://github.com/gentoo/gentoo/pull/33012 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/ardour/ardour-9999.ebuild | 1 - media-sound/ardour/files/ardour-7.4-libc++.patch | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) 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 <[email protected]> #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 <[email protected]> #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 <[email protected]> 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
