diff options
| author | joerg <joerg@pkgsrc.org> | 2016-06-21 17:58:05 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-06-21 17:58:05 +0000 |
| commit | 71233d127b369118a154c0283de883934ec92265 (patch) | |
| tree | 5ba5ace7034c7ac1491b38d7a6da773011384efa | |
| parent | 4cc2aba61c572f98a6cba72f23958b7fa43e945f (diff) | |
| download | pkgsrc-71233d127b369118a154c0283de883934ec92265.tar.gz | |
Adjust the static_assert hack to not redefine the keyword if the
compiler itself claims C11 support.
| -rw-r--r-- | multimedia/vlc/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-include_vlc__fixups.h | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 20bece02798..0b454bbe778 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2016/05/12 15:56:15 wiz Exp $ +$NetBSD: distinfo,v 1.70 2016/06/21 17:58:05 joerg Exp $ SHA1 (vlc-2.2.3.tar.xz) = 8d83c7b81e63956fdcb5cbee58cb2474d06baeae RMD160 (vlc-2.2.3.tar.xz) = 8c6d4194da37210fe409c965f430898fbe7f2416 @@ -8,7 +8,7 @@ SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076 SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c -SHA1 (patch-include_vlc__fixups.h) = 277cc7985f66fe3e8e94c75003e25aabd2f1bbfc +SHA1 (patch-include_vlc__fixups.h) = 1a9f58b70f43fb87381d75d856682e3bcad14f6c SHA1 (patch-include_vlc_atomic.h) = 682ad69ece0267d41b62ef85429a8de312c17688 SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7 SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1 diff --git a/multimedia/vlc/patches/patch-include_vlc__fixups.h b/multimedia/vlc/patches/patch-include_vlc__fixups.h index b94ee2d21f6..f6997e2b8e1 100644 --- a/multimedia/vlc/patches/patch-include_vlc__fixups.h +++ b/multimedia/vlc/patches/patch-include_vlc__fixups.h @@ -1,13 +1,13 @@ -$NetBSD: patch-include_vlc__fixups.h,v 1.2 2015/10/25 11:00:18 wiz Exp $ +$NetBSD: patch-include_vlc__fixups.h,v 1.3 2016/06/21 17:58:05 joerg Exp $ on NetBSD-current, just define "uselocale", nothing else fixes build -static_assert: a C compiler is used to detect if this symbol -exists in assert.h, but the header file is included by a c++ -compiler too. +static_assert: Assume that a compiler in C11 or C++11 frontend mode +has the _Static_assert keyword, but define the macro if it is missing +from the headers. ---- include/vlc_fixups.h.orig 2015-02-17 09:07:37.000000000 +0000 +--- include/vlc_fixups.h.orig 2015-04-13 19:54:35.000000000 +0000 +++ include/vlc_fixups.h @@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz @@ -38,7 +38,7 @@ compiler too. static inline void freelocale(locale_t loc) { (void)loc; -@@ -238,8 +250,9 @@ static inline locale_t newlocale(int mas +@@ -238,9 +250,12 @@ static inline locale_t newlocale(int mas return NULL; } #endif @@ -46,6 +46,9 @@ compiler too. -#if !defined (HAVE_STATIC_ASSERT) +#if !defined (static_assert) ++# if !(__STDC_VERSION__ - 0 >= 201112L || __cplusplus >= 201103L) # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) ++# endif # define static_assert _Static_assert #endif + |