From owner-svn-ports-head@FreeBSD.ORG Tue Sep 10 15:40:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 88914A5A; Tue, 10 Sep 2013 15:40:27 +0000 (UTC) (envelope-from bapt@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 66A7A248E; Tue, 10 Sep 2013 15:40:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AFeR8P006166; Tue, 10 Sep 2013 15:40:27 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AFeRqN006164; Tue, 10 Sep 2013 15:40:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201309101540.r8AFeRqN006164@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 10 Sep 2013 15:40:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326912 - in head/graphics: opencv-core opencv/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:40:27 -0000 Author: bapt Date: Tue Sep 10 15:40:26 2013 New Revision: 326912 URL: http://svnweb.freebsd.org/changeset/ports/326912 Log: Fix opencv-core with libc++ Submitted by: theraven Added: head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h (contents, props changed) Modified: head/graphics/opencv-core/Makefile Modified: head/graphics/opencv-core/Makefile ============================================================================== --- head/graphics/opencv-core/Makefile Tue Sep 10 15:31:48 2013 (r326911) +++ head/graphics/opencv-core/Makefile Tue Sep 10 15:40:26 2013 (r326912) @@ -4,4 +4,9 @@ _BUILDING_OPENCV_CORE= yes MASTERDIR= ${.CURDIR}/../opencv +_COMPVERSION!= ${CC} --version +.if ${_COMPVERSION:Mclang} +CXXFLAGS+= -std=gnu++11 -Wno-error -Wno-c++11-narrowing +.endif + .include "${MASTERDIR}/Makefile" Added: head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opencv/files/patch-modules__ts__include__opencv2__ts__ts_gtest.h Tue Sep 10 15:40:26 2013 (r326912) @@ -0,0 +1,268 @@ +--- ./modules/ts/include/opencv2/ts/ts_gtest.h.orig 2013-09-01 01:03:57.000000000 +0100 ++++ ./modules/ts/include/opencv2/ts/ts_gtest.h 2013-09-01 01:03:38.000000000 +0100 +@@ -53,6 +53,7 @@ + + #include + #include ++#include + + // Copyright 2005, Google Inc. + // All rights reserved. +@@ -543,7 +544,7 @@ + // Author: wan@google.com (Zhanyong Wan) + + // Implements a subset of TR1 tuple needed by Google Test and Google Mock. +- ++#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ 1 + #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ + #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ + +@@ -1504,11 +1505,31 @@ + // . Hence the following #define is a hack to prevent + // from being included. + #define _TR1_FUNCTIONAL 1 ++#if __has_include() ++#include ++namespace gtest { ++ using ::std::tuple; ++} ++#else + #include ++namespace gtest { ++ using ::std::tr1::tuple; ++} ++#endif + #undef _TR1_FUNCTIONAL // Allows the user to #include + // if he chooses to. + #else +-#include // NOLINT ++#if __has_include() ++#include ++namespace gtest { ++ using ::std::tuple; ++} ++#else ++#include ++namespace gtest { ++ using ::std::tr1::tuple; ++} ++#endif + #endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 + + #else +@@ -11951,9 +11972,9 @@ + // + template + class CartesianProductGenerator2 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { ++ : public ParamGeneratorInterface< gtest::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator2(const ParamGenerator& g1, + const ParamGenerator& g2) +@@ -12066,9 +12087,9 @@ + + template + class CartesianProductGenerator3 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { ++ : public ParamGeneratorInterface< gtest::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator3(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3) +@@ -12198,9 +12219,9 @@ + + template + class CartesianProductGenerator4 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { ++ : public ParamGeneratorInterface< gtest::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator4(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -12349,9 +12370,9 @@ + + template + class CartesianProductGenerator5 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { ++ : public ParamGeneratorInterface< gtest::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator5(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -12517,10 +12538,10 @@ + template + class CartesianProductGenerator6 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator6(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -12703,10 +12724,10 @@ + template + class CartesianProductGenerator7 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator7(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -12906,10 +12927,10 @@ + template + class CartesianProductGenerator8 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator8(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -13128,10 +13149,10 @@ + template + class CartesianProductGenerator9 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator9(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -13367,10 +13388,10 @@ + template + class CartesianProductGenerator10 +- : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: +- typedef ::std::tr1::tuple ParamType; ++ typedef gtest::tuple ParamType; + + CartesianProductGenerator10(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, +@@ -13632,8 +13653,8 @@ + CartesianProductHolder2(const Generator1& g1, const Generator2& g2) + : g1_(g1), g2_(g2) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ operator ParamGenerator< gtest::tuple >() const { ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator2( + static_cast >(g1_), + static_cast >(g2_))); +@@ -13654,8 +13675,8 @@ + const Generator3& g3) + : g1_(g1), g2_(g2), g3_(g3) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ operator ParamGenerator< gtest::tuple >() const { ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator3( + static_cast >(g1_), + static_cast >(g2_), +@@ -13679,8 +13700,8 @@ + const Generator3& g3, const Generator4& g4) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ operator ParamGenerator< gtest::tuple >() const { ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator4( + static_cast >(g1_), + static_cast >(g2_), +@@ -13706,8 +13727,8 @@ + const Generator3& g3, const Generator4& g4, const Generator5& g5) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ operator ParamGenerator< gtest::tuple >() const { ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator5( + static_cast >(g1_), + static_cast >(g2_), +@@ -13737,8 +13758,8 @@ + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ operator ParamGenerator< gtest::tuple >() const { ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator6( + static_cast >(g1_), + static_cast >(g2_), +@@ -13770,9 +13791,9 @@ + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator7( + static_cast >(g1_), + static_cast >(g2_), +@@ -13808,9 +13829,9 @@ + g8_(g8) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( ++ return ParamGenerator< gtest::tuple >( + new CartesianProductGenerator8( + static_cast >(g1_), + static_cast >(g2_), +@@ -13849,9 +13870,9 @@ + g9_(g9) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator9( + static_cast >(g1_), +@@ -13893,9 +13914,9 @@ + g9_(g9), g10_(g10) {} + template +- operator ParamGenerator< ::std::tr1::tuple >() const { +- return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator10(