Tue Jun 21 17:58:06 2016 UTC ()
Adjust the static_assert hack to not redefine the keyword if the
compiler itself claims C11 support.


(joerg)
diff -r1.69 -r1.70 pkgsrc/multimedia/vlc/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h
cvs diff -r1.69 -r1.70 pkgsrc/multimedia/vlc/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2016/05/12 15:56:15 1.69
+++ pkgsrc/multimedia/vlc/distinfo 2016/06/21 17:58:05 1.70
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.69 2016/05/12 15:56:15 wiz Exp $ 1$NetBSD: distinfo,v 1.70 2016/06/21 17:58:05 joerg Exp $
2 2
3SHA1 (vlc-2.2.3.tar.xz) = 8d83c7b81e63956fdcb5cbee58cb2474d06baeae 3SHA1 (vlc-2.2.3.tar.xz) = 8d83c7b81e63956fdcb5cbee58cb2474d06baeae
4RMD160 (vlc-2.2.3.tar.xz) = 8c6d4194da37210fe409c965f430898fbe7f2416 4RMD160 (vlc-2.2.3.tar.xz) = 8c6d4194da37210fe409c965f430898fbe7f2416
5SHA512 (vlc-2.2.3.tar.xz) = 8469a8e0a6ff7ef4beac940d69d310dd4a4c9d44fb1dc8101dc8b697fc6357b5fda03f8f1096015aae7c425c6cca196415b9567fe7d96a991f020d452f976e5e 5SHA512 (vlc-2.2.3.tar.xz) = 8469a8e0a6ff7ef4beac940d69d310dd4a4c9d44fb1dc8101dc8b697fc6357b5fda03f8f1096015aae7c425c6cca196415b9567fe7d96a991f020d452f976e5e
6Size (vlc-2.2.3.tar.xz) = 21835204 bytes 6Size (vlc-2.2.3.tar.xz) = 21835204 bytes
7SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076 7SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076
8SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd 8SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd
9SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee 9SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee
10SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c 10SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c
11SHA1 (patch-include_vlc__fixups.h) = 277cc7985f66fe3e8e94c75003e25aabd2f1bbfc 11SHA1 (patch-include_vlc__fixups.h) = 1a9f58b70f43fb87381d75d856682e3bcad14f6c
12SHA1 (patch-include_vlc_atomic.h) = 682ad69ece0267d41b62ef85429a8de312c17688 12SHA1 (patch-include_vlc_atomic.h) = 682ad69ece0267d41b62ef85429a8de312c17688
13SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7 13SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7
14SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1 14SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1
15SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53 15SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53
16SHA1 (patch-modules_gui_qt4_components_controller.cpp) = 5822f018f910d1b0e441782ffeff193ebc35b6d2 16SHA1 (patch-modules_gui_qt4_components_controller.cpp) = 5822f018f910d1b0e441782ffeff193ebc35b6d2
17SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d5769fc71e097366e5bc2f70 17SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d5769fc71e097366e5bc2f70
18SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb 18SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb
19SHA1 (patch-modules_gui_qt4_components_interface__widgets.hpp) = 9ac2782bcb1a306123662fd3e4f44b82149c111a 19SHA1 (patch-modules_gui_qt4_components_interface__widgets.hpp) = 9ac2782bcb1a306123662fd3e4f44b82149c111a
20SHA1 (patch-modules_gui_qt4_dialogs_messages.cpp) = 8f4abf85ecd435bb1d2964e5ac16fc09ecaa5ab0 20SHA1 (patch-modules_gui_qt4_dialogs_messages.cpp) = 8f4abf85ecd435bb1d2964e5ac16fc09ecaa5ab0
21SHA1 (patch-modules_gui_qt4_input__manager.cpp) = cf9db2c8a4bd4b6080cca0534dcc5065555c6d4a 21SHA1 (patch-modules_gui_qt4_input__manager.cpp) = cf9db2c8a4bd4b6080cca0534dcc5065555c6d4a
22SHA1 (patch-modules_gui_qt4_input__manager.hpp) = ccc5f5fd53942f168e95d472731ee3f6a4d8ddb0 22SHA1 (patch-modules_gui_qt4_input__manager.hpp) = ccc5f5fd53942f168e95d472731ee3f6a4d8ddb0
23SHA1 (patch-modules_gui_qt4_main__interface.cpp) = 11b9600a6e3c11268afc7c38859c5b62a1e8ee0d 23SHA1 (patch-modules_gui_qt4_main__interface.cpp) = 11b9600a6e3c11268afc7c38859c5b62a1e8ee0d
24SHA1 (patch-modules_gui_qt4_main__interface.hpp) = 1c3028519662d99c023375c5ee74e9f490c16f3c 24SHA1 (patch-modules_gui_qt4_main__interface.hpp) = 1c3028519662d99c023375c5ee74e9f490c16f3c
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/vlc/patches/Attic/patch-include_vlc__fixups.h (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/patches/Attic/patch-include_vlc__fixups.h 2015/10/25 11:00:18 1.2
+++ pkgsrc/multimedia/vlc/patches/Attic/patch-include_vlc__fixups.h 2016/06/21 17:58:05 1.3
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-include_vlc__fixups.h,v 1.2 2015/10/25 11:00:18 wiz Exp $ 1$NetBSD: patch-include_vlc__fixups.h,v 1.3 2016/06/21 17:58:05 joerg Exp $
2 2
3on NetBSD-current, just define "uselocale", nothing else 3on NetBSD-current, just define "uselocale", nothing else
4fixes build 4fixes build
5 5
6static_assert: a C compiler is used to detect if this symbol 6static_assert: Assume that a compiler in C11 or C++11 frontend mode
7exists in assert.h, but the header file is included by a c++ 7has the _Static_assert keyword, but define the macro if it is missing
8compiler too. 8from the headers.
9 9
10--- include/vlc_fixups.h.orig 2015-02-17 09:07:37.000000000 +0000 10--- include/vlc_fixups.h.orig 2015-04-13 19:54:35.000000000 +0000
11+++ include/vlc_fixups.h 11+++ include/vlc_fixups.h
12@@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz 12@@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz
13  13
14 /* locale.h */ 14 /* locale.h */
15 #ifndef HAVE_USELOCALE 15 #ifndef HAVE_USELOCALE
16+#ifdef __NetBSD__ 16+#ifdef __NetBSD__
17+#include <sys/param.h> 17+#include <sys/param.h>
18+#if __NetBSD_Version__ >= 699002300 18+#if __NetBSD_Version__ >= 699002300
19+/* NetBSD-current has locale_t but no uselocale */ 19+/* NetBSD-current has locale_t but no uselocale */
20+#define NetBSD_LOCALE_HACK 20+#define NetBSD_LOCALE_HACK
21+#endif 21+#endif
22+#endif 22+#endif
23+#ifdef NetBSD_LOCALE_HACK 23+#ifdef NetBSD_LOCALE_HACK
@@ -28,24 +28,27 @@ compiler too. @@ -28,24 +28,27 @@ compiler too.
28 #define LC_MESSAGES_MASK 0 28 #define LC_MESSAGES_MASK 0
29 #define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1) 29 #define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1)
30 typedef void *locale_t; 30 typedef void *locale_t;
31+#endif 31+#endif
32 static inline locale_t uselocale(locale_t loc) 32 static inline locale_t uselocale(locale_t loc)
33 { 33 {
34 (void)loc; 34 (void)loc;
35 return NULL; 35 return NULL;
36 } 36 }
37+#ifndef NetBSD_LOCALE_HACK 37+#ifndef NetBSD_LOCALE_HACK
38 static inline void freelocale(locale_t loc) 38 static inline void freelocale(locale_t loc)
39 { 39 {
40 (void)loc; 40 (void)loc;
41@@ -238,8 +250,9 @@ static inline locale_t newlocale(int mas 41@@ -238,9 +250,12 @@ static inline locale_t newlocale(int mas
42 return NULL; 42 return NULL;
43 } 43 }
44 #endif 44 #endif
45+#endif 45+#endif
46  46
47-#if !defined (HAVE_STATIC_ASSERT) 47-#if !defined (HAVE_STATIC_ASSERT)
48+#if !defined (static_assert) 48+#if !defined (static_assert)
 49+# if !(__STDC_VERSION__ - 0 >= 201112L || __cplusplus >= 201103L)
49 # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) 50 # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
 51+# endif
50 # define static_assert _Static_assert 52 # define static_assert _Static_assert
51 #endif 53 #endif
 54