Wed Sep 23 12:02:27 2015 UTC ()
Remove NetBSD specific clang hack, stdatomic.h is now installed.
Rework vlc_atomic.h to work with <atomic> to avoid overlap.


(joerg)
diff -r1.2 -r1.3 pkgsrc/multimedia/vlc21/distinfo
diff -r1.1 -r0 pkgsrc/multimedia/vlc21/hacks.mk
diff -r0 -r1.1 pkgsrc/multimedia/vlc21/patches/patch-include_vlc__atomic.h

cvs diff -r1.2 -r1.3 pkgsrc/multimedia/vlc21/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc21/Attic/distinfo 2015/01/23 16:01:40 1.2
+++ pkgsrc/multimedia/vlc21/Attic/distinfo 2015/09/23 12:02:27 1.3
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.2 2015/01/23 16:01:40 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2015/09/23 12:02:27 joerg Exp $
2 2
3SHA1 (vlc-2.1.5.tar.xz) = 7f1cb6324a04cf393896bbb5976ca9febd7b3efc 3SHA1 (vlc-2.1.5.tar.xz) = 7f1cb6324a04cf393896bbb5976ca9febd7b3efc
4RMD160 (vlc-2.1.5.tar.xz) = 4a18210f0f01ac8dfaf166926ab10eea6d97fbae 4RMD160 (vlc-2.1.5.tar.xz) = 4a18210f0f01ac8dfaf166926ab10eea6d97fbae
5Size (vlc-2.1.5.tar.xz) = 19574208 bytes 5Size (vlc-2.1.5.tar.xz) = 19574208 bytes
6SHA1 (patch-aa) = 161e1bfb84189f457e621b20359ccf63af305876 6SHA1 (patch-aa) = 161e1bfb84189f457e621b20359ccf63af305876
7SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905 7SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
8SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270 8SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
9SHA1 (patch-ad) = 092feb93d7f5ffe5f32f3cb9769207b1f321b78f 9SHA1 (patch-ad) = 092feb93d7f5ffe5f32f3cb9769207b1f321b78f
10SHA1 (patch-ae) = e1396da87cadb7c228f8eb6d27212fa2e4a83151 10SHA1 (patch-ae) = e1396da87cadb7c228f8eb6d27212fa2e4a83151
11SHA1 (patch-af) = 89d84e8329fa73a4fa573a5fb65adf9c11fb1149 11SHA1 (patch-af) = 89d84e8329fa73a4fa573a5fb65adf9c11fb1149
12SHA1 (patch-ag) = 4ebcb592dc0b172cdfb90ab423cf39903d8f79bb 12SHA1 (patch-ag) = 4ebcb592dc0b172cdfb90ab423cf39903d8f79bb
13SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3 13SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3
14SHA1 (patch-ai) = 51bd47a21427fcf45b4cfcb718742207de4e5bc3 14SHA1 (patch-ai) = 51bd47a21427fcf45b4cfcb718742207de4e5bc3
15SHA1 (patch-ar) = 7edc5cd6a80e65e394bb0a4dac3a9c68274d5142 15SHA1 (patch-ar) = 7edc5cd6a80e65e394bb0a4dac3a9c68274d5142
16SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef 16SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
17SHA1 (patch-au) = 8228c28f208051f17aa8c99827e5297b1b08cb19 17SHA1 (patch-au) = 8228c28f208051f17aa8c99827e5297b1b08cb19
18SHA1 (patch-av) = f496ee18de5b0b0764479eb9c6520666ffad67ba 18SHA1 (patch-av) = f496ee18de5b0b0764479eb9c6520666ffad67ba
19SHA1 (patch-ca) = 20481ea8779e20d5632ef8073bd5f3acad21be12 19SHA1 (patch-ca) = 20481ea8779e20d5632ef8073bd5f3acad21be12
20SHA1 (patch-compat_Makefile.am) = c2f22208b5bdfbd6349e2200c5067d89db90259f 20SHA1 (patch-compat_Makefile.am) = c2f22208b5bdfbd6349e2200c5067d89db90259f
21SHA1 (patch-compat_Makefile.in) = fa8f2fc63d80169d760838e4080fd79b41b20bb3 21SHA1 (patch-compat_Makefile.in) = fa8f2fc63d80169d760838e4080fd79b41b20bb3
 22SHA1 (patch-include_vlc__atomic.h) = 24e6e27c44a1d2776e89d0c3624eab16ad3b074d
22SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a 23SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
23SHA1 (patch-modules_access_rtp_Makefile.in) = 3d8dccd16a486b2fe4fa3f7ef7a7cca3dd2c00de 24SHA1 (patch-modules_access_rtp_Makefile.in) = 3d8dccd16a486b2fe4fa3f7ef7a7cca3dd2c00de
24SHA1 (patch-modules_audio__output_pulse.c) = 39fe574ef63ad3c4ce9ca4db92a80e42755cdde9 25SHA1 (patch-modules_audio__output_pulse.c) = 39fe574ef63ad3c4ce9ca4db92a80e42755cdde9
25SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b 26SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
26SHA1 (patch-src_config_file.c) = 9a3c19da1425d3617b6221b5e3e2c90ad2ae53f9 27SHA1 (patch-src_config_file.c) = 9a3c19da1425d3617b6221b5e3e2c90ad2ae53f9

File Deleted: pkgsrc/multimedia/vlc21/Attic/hacks.mk

File Added: pkgsrc/multimedia/vlc21/patches/Attic/patch-include_vlc__atomic.h
$NetBSD: patch-include_vlc__atomic.h,v 1.1 2015/09/23 12:02:27 joerg Exp $

--- include/vlc_atomic.h.orig	2015-09-21 14:00:58.000000000 +0000
+++ include/vlc_atomic.h
@@ -25,13 +25,26 @@
  * \file
  * Atomic operations do not require locking, but they are not very powerful.
  */
+#if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__)
+#define HAS_STDATOMIC_H
+#elif __cplusplus - 0 >= 201103L
+#define HAS_ATOMIC
+#elif defined(__has_include)
+#  if defined(__cplusplus) && __has_include(<atomic>)
+#  define HAS_ATOMIC
+#  elif __has_include(<stdatomic.h>)
+#  define HAS_STDATOMIC_H
+#  endif
+#endif
 
-# if !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \
-  && !defined (__STDC_NO_ATOMICS__)
 
+# if defined(HAS_STDATOMIC_H)
 /*** Native C11 atomics ***/
 #  include <stdatomic.h>
-
+# elif defined(HAS_ATOMIC)
+#  include <atomic>
+using std::atomic_uint_least32_t;
+using std::atomic_uintptr_t;
 # else
 
 #  define ATOMIC_FLAG_INIT false
@@ -310,7 +323,7 @@ typedef         uintmax_t atomic_uintmax
 /**
  * Memory storage space for an atom. Never access it directly.
  */
-typedef union
+typedef struct
 {
     atomic_uintptr_t u;
 } vlc_atomic_t;