Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6D93D7A3D8 for ; Tue, 21 Jun 2016 17:58:07 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1D1DA85EB2; Tue, 21 Jun 2016 17:58:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A1F0285EA8 for ; Tue, 21 Jun 2016 17:58:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id keRFdEjmVVoV for ; Tue, 21 Jun 2016 17:58:06 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 25ED685E87 for ; Tue, 21 Jun 2016 17:58:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1F240FBB5; Tue, 21 Jun 2016 17:58:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1466531886210870" MIME-Version: 1.0 Date: Tue, 21 Jun 2016 17:58:06 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/multimedia/vlc To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20160621175806.1F240FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1466531886210870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Jun 21 17:58:06 UTC 2016 Modified Files: pkgsrc/multimedia/vlc: distinfo pkgsrc/multimedia/vlc/patches: patch-include_vlc__fixups.h Log Message: Adjust the static_assert hack to not redefine the keyword if the compiler itself claims C11 support. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 pkgsrc/multimedia/vlc/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1466531886210870 Content-Disposition: inline Content-Length: 2929 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/vlc/distinfo diff -u pkgsrc/multimedia/vlc/distinfo:1.69 pkgsrc/multimedia/vlc/distinfo:1.70 --- pkgsrc/multimedia/vlc/distinfo:1.69 Thu May 12 15:56:15 2016 +++ pkgsrc/multimedia/vlc/distinfo Tue Jun 21 17:58:05 2016 @@ -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) = 0190b65ec2 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 Index: pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h diff -u pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h:1.2 pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h:1.3 --- pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h:1.2 Sun Oct 25 11:00:18 2015 +++ pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h Tue Jun 21 17:58:05 2016 @@ -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 + --_----------=_1466531886210870--