From owner-svn-ports-head@FreeBSD.ORG Tue Sep 10 15:01:36 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A9B97B4F; Tue, 10 Sep 2013 15:01:36 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7B494219F; Tue, 10 Sep 2013 15:01:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AF1afl083879; Tue, 10 Sep 2013 15:01:36 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AF1afx083876; Tue, 10 Sep 2013 15:01:36 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201309101501.r8AF1afx083876@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 10 Sep 2013 15:01:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326906 - head/deskutils/libstreamanalyzer/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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 15:01:36 -0000 Author: rakuco Date: Tue Sep 10 15:01:35 2013 New Revision: 326906 URL: http://svnweb.freebsd.org/changeset/ports/326906 Log: Add my upstream commit that fixes the build with libc++. Added: head/deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__plugins__endplugins__ffmpegendanalyzer.cpp (contents, props changed) Added: head/deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__plugins__endplugins__ffmpegendanalyzer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__plugins__endplugins__ffmpegendanalyzer.cpp Tue Sep 10 15:01:35 2013 (r326906) @@ -0,0 +1,50 @@ +From ae11c0b24fd3be995185ebdc5a5bbbb92ff30843 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Tue, 10 Sep 2013 17:50:56 +0300 +Subject: [PATCH] ffmpeg: Rename `mutex' to `g_mutex'. + +std::mutex is an actual type in C++11 and is implemented by libc++. The +build was failing because references to `mutex' in lockmgr were ambiguous, +as both the mutex variable defined above and std::mutex (because of the +`using namespace std' statement) were found. +--- + plugins/endplugins/ffmpegendanalyzer.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/plugins/endplugins/ffmpegendanalyzer.cpp b/plugins/endplugins/ffmpegendanalyzer.cpp +index f219912..eaed07f 100644 +--- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp ++++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp +@@ -56,22 +56,22 @@ public: + signed char analyze(AnalysisResult& idx, ::InputStream* in); + }; + +-STRIGI_MUTEX_DEFINE(mutex); ++STRIGI_MUTEX_DEFINE(g_mutex); + + static int + lockmgr(void **mtx, enum AVLockOp op) { + // pre-allocating a single mutex is the only way to get it to work without changing strigi_thread.h +- assert( (*mtx == &mutex) || (op == AV_LOCK_CREATE) ); ++ assert( (*mtx == &g_mutex) || (op == AV_LOCK_CREATE) ); + switch(op) { + case AV_LOCK_CREATE: +- *mtx = &mutex; +- return !!STRIGI_MUTEX_INIT(&mutex); ++ *mtx = &g_mutex; ++ return !!STRIGI_MUTEX_INIT(&g_mutex); + case AV_LOCK_OBTAIN: +- return !!STRIGI_MUTEX_LOCK(&mutex); ++ return !!STRIGI_MUTEX_LOCK(&g_mutex); + case AV_LOCK_RELEASE: +- return !!STRIGI_MUTEX_UNLOCK(&mutex); ++ return !!STRIGI_MUTEX_UNLOCK(&g_mutex); + case AV_LOCK_DESTROY: +- STRIGI_MUTEX_DESTROY(&mutex); ++ STRIGI_MUTEX_DESTROY(&g_mutex); + return 0; + } + return 1; +-- +1.8.4 +