From owner-svn-ports-all@freebsd.org Wed Jun 1 06:17:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00D27B5D2BF; Wed, 1 Jun 2016 06:17:53 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D08591D26; Wed, 1 Jun 2016 06:17:52 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u516HqN5000601; Wed, 1 Jun 2016 06:17:52 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u516Hp6Q000597; Wed, 1 Jun 2016 06:17:51 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201606010617.u516Hp6Q000597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Wed, 1 Jun 2016 06:17:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416225 - head/multimedia/vlc/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2016 06:17:53 -0000 Author: riggs Date: Wed Jun 1 06:17:51 2016 New Revision: 416225 URL: https://svnweb.freebsd.org/changeset/ports/416225 Log: Fix build with libc++ 3.8.0 VLC brings its own header for atomic operations which defines a whole bunch of atomic macros, conflicting with the ones in the C++ standard header. This changeset works around those. PR: 209722 Submitted by: dim Added: head/multimedia/vlc/files/patch-include_vlc__atomic.h (contents, props changed) head/multimedia/vlc/files/patch-include_vlc__playlist.h (contents, props changed) head/multimedia/vlc/files/patch-include_vlc__sout.h (contents, props changed) head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp (contents, props changed) Added: head/multimedia/vlc/files/patch-include_vlc__atomic.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-include_vlc__atomic.h Wed Jun 1 06:17:51 2016 (r416225) @@ -0,0 +1,17 @@ +--- include/vlc_atomic.h.orig 2014-08-14 07:20:03 UTC ++++ include/vlc_atomic.h +@@ -32,6 +32,14 @@ + /*** Native C11 atomics ***/ + # include + ++# elif defined (__cplusplus) && defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3800 ++ ++# include ++ ++using std::atomic_uint_least32_t; ++using std::atomic_uintptr_t; ++using std::atomic_int; ++ + # else + + # define ATOMIC_FLAG_INIT false Added: head/multimedia/vlc/files/patch-include_vlc__playlist.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-include_vlc__playlist.h Wed Jun 1 06:17:51 2016 (r416225) @@ -0,0 +1,19 @@ +--- include/vlc_playlist.h.orig 2014-11-16 18:57:58 UTC ++++ include/vlc_playlist.h +@@ -24,13 +24,13 @@ + #ifndef VLC_PLAYLIST_H_ + #define VLC_PLAYLIST_H_ + ++#include ++#include ++ + # ifdef __cplusplus + extern "C" { + # endif + +-#include +-#include +- + TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t) + + struct intf_thread_t; Added: head/multimedia/vlc/files/patch-include_vlc__sout.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-include_vlc__sout.h Wed Jun 1 06:17:51 2016 (r416225) @@ -0,0 +1,22 @@ +--- include/vlc_sout.h.orig 2014-11-16 18:57:58 UTC ++++ include/vlc_sout.h +@@ -28,6 +28,9 @@ + #ifndef VLC_SOUT_H_ + #define VLC_SOUT_H_ + ++#include ++#include ++ + /** + * \file + * This file defines structures and functions for stream output in vlc +@@ -37,9 +40,6 @@ + extern "C" { + #endif + +-#include +-#include +- + /** Stream output instance (FIXME: should be private to src/ to avoid + * invalid unsynchronized access) */ + struct sout_instance_t Added: head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp Wed Jun 1 06:17:51 2016 (r416225) @@ -0,0 +1,11 @@ +--- modules/gui/qt4/dialogs/messages.hpp.orig 2014-08-14 07:20:04 UTC ++++ modules/gui/qt4/dialogs/messages.hpp +@@ -55,7 +55,7 @@ private: + void sinkMessage( const MsgEvent * ); + bool matchFilter( const QString& ); + +- atomic_uint verbosity; ++ atomic_int verbosity; + static void MsgCallback( void *, int, const vlc_log_t *, const char *, + va_list ); +