diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-06 09:39:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-06 09:39:06 +0100 |
| commit | 996d1cba721b044876526a7f3c1d2ef1fcc90bb4 (patch) | |
| tree | 16fac72b3f131ad5671db34f88cd6426ff602706 /media-sound/ardour/files | |
| parent | 0cfdfb9b75c154c98f3963d4a002425218e29efc (diff) | |
gentoo auto-resync : 06:06:2023 - 09:39:05
Diffstat (limited to 'media-sound/ardour/files')
| -rw-r--r-- | media-sound/ardour/files/ardour-6.8-metadata.patch | 2 | ||||
| -rw-r--r-- | media-sound/ardour/files/ardour-7.4-libc++.patch | 39 |
2 files changed, 39 insertions, 2 deletions
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 |