<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1889f531bf4487bc544d680b7b2af67f0718828f">https://github.com/macports/macports-ports/commit/1889f531bf4487bc544d680b7b2af67f0718828f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 1889f531bf4 dav1d: use correct types with clang atomics
</span>1889f531bf4 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1889f531bf4487bc544d680b7b2af67f0718828f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 4 13:49:32 2021 +1100

<span style='display:block; white-space:pre;color:#404040;'>    dav1d: use correct types with clang atomics
</span>---
 multimedia/dav1d/files/atomic.patch | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dav1d/files/atomic.patch b/multimedia/dav1d/files/atomic.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a0514836318..dfee0600e35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/dav1d/files/atomic.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dav1d/files/atomic.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span> --- include/compat/gcc/stdatomic.h.orig   2021-01-02 07:36:25.000000000 +1100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/compat/gcc/stdatomic.h      2021-02-04 01:57:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/compat/gcc/stdatomic.h 2021-02-04 13:46:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,18 +29,42 @@
</span>  
  #if !defined(__cplusplus)
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef int atomic_int;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned int atomic_uint;
</span> +#ifdef __clang__
 +#if !defined(__has_feature)
 +#define __has_feature(x) 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,21 +19,23 @@
</span> +#define __CLANG_ATOMICS
 +#endif
 +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int atomic_int;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned int atomic_uint;
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,11 +50,19 @@ typedef unsigned int atomic_uint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define memory_order_relaxed __ATOMIC_RELAXED
</span>  #define memory_order_acquire __ATOMIC_ACQUIRE
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define atomic_init(p_a, v)           do { *(p_a) = (v); } while(0)
</span> +#ifdef __CLANG_ATOMICS
<span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef _Atomic(int) atomic_int;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef _Atomic(unsigned int) atomic_uint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define atomic_init(p_a, v)           __c11_atomic_init(p_a, v)
</span> +#define atomic_store(p_a, v)          __c11_atomic_store(p_a, v, __ATOMIC_SEQ_CST)
 +#define atomic_load(p_a)              __c11_atomic_load(p_a, __ATOMIC_SEQ_CST)
 +#define atomic_load_explicit(p_a, mo) __c11_atomic_load(p_a, mo)
 +#define atomic_fetch_add(p_a, inc)    __c11_atomic_fetch_add(p_a, inc, __ATOMIC_SEQ_CST)
 +#define atomic_fetch_sub(p_a, dec)    __c11_atomic_fetch_sub(p_a, dec, __ATOMIC_SEQ_CST)
 +else
<span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int atomic_int;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned int atomic_uint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_init(p_a, v)           do { *(p_a) = (v); } while(0)
</span>  #define atomic_store(p_a, v)          __atomic_store_n(p_a, v, __ATOMIC_SEQ_CST)
  #define atomic_load(p_a)              __atomic_load_n(p_a, __ATOMIC_SEQ_CST)
  #define atomic_load_explicit(p_a, mo) __atomic_load_n(p_a, mo)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +51,7 @@
</span>          stdatomic_dependency = declare_dependency(
              include_directories : include_directories('include/compat/gcc'),
          )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    elif cc.compiles('''int main() { int v = 0; return __c11_atomic_fetch_add(&v, 1, __ATOMIC_SEQ_CST); }''',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    elif cc.compiles('''int main() { _Atomic(int) v = 0; return __c11_atomic_fetch_add(&v, 1, __ATOMIC_SEQ_CST); }''',
</span> +                     name : 'Clang-style atomics', args : test_args)
 +        stdatomic_dependency = declare_dependency(
 +            include_directories : include_directories('include/compat/gcc'),
</pre><pre style='margin:0'>

</pre>