From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 21 09:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 360A71DE for ; Sat, 21 Sep 2013 09:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 22F2B2445 for ; Sat, 21 Sep 2013 09:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8L9e1xu083914 for ; Sat, 21 Sep 2013 09:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8L9e13g083913; Sat, 21 Sep 2013 09:40:01 GMT (envelope-from gnats) Date: Sat, 21 Sep 2013 09:40:01 GMT Message-Id: <201309210940.r8L9e13g083913@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Shane Ambler Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA and pass poudriere testpor X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Shane Ambler List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Sep 2013 09:40:02 -0000 The following reply was made to PR ports/182220; it has been noted by GNATS. From: Shane Ambler To: bug-followup@FreeBSD.org, swills@freebsd.org Cc: Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA and pass poudriere testpor Date: Sat, 21 Sep 2013 19:03:51 +0930 This is a multi-part message in MIME format. --------------080207070708000002040701 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I improved the test to be more specific and added -std=c++11 cxxflags Also remove MAKE_JOBS_SAFE Not certain that the pkg-plist changes are needed but do no harm. --------------080207070708000002040701 Content-Type: text/plain; charset=UTF-8; name="opencolorio.patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="opencolorio.patch.txt" diff -Nru opencolorio.orig/Makefile opencolorio/Makefile --- opencolorio.orig/Makefile 2013-09-21 18:54:01.756081148 +0930 +++ opencolorio/Makefile 2013-09-21 18:52:12.111081631 +0930 @@ -3,7 +3,7 @@ PORTNAME?= opencolorio PORTVERSION= 1.0.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -29,8 +29,6 @@ -DOCIO_BUILD_STATIC:BOOL=OFF \ -DOCIO_BUILD_PYGLUE:BOOL=ON -MAKE_JOBS_SAFE?= yes - PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} .if !defined(OCIO_TOOLS) @@ -61,6 +59,10 @@ CFLAGS+= -march=pentium2 .endif +.if (${CXX:T} == "clang++" && ${OSVERSION} > 902000) || ${OSVERSION} > 1000054 +CXXFLAGS+= -stdlib=libc++ -std=c++11 +.endif + post-patch: .if defined(OCIO_TOOLS) @${FIND} ${WRKSRC}/src/apps -name "main.cpp" -exec \ diff -Nru opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.h.in opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in --- opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.h.in 2013-09-21 18:54:01.743091115 +0930 +++ opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in 2013-09-21 18:52:12.111081631 +0930 @@ -1,6 +1,17 @@ --- export/OpenColorIO/OpenColorABI.h.in.orig 2012-12-12 09:51:23.000000000 +1030 -+++ export/OpenColorIO/OpenColorABI.h.in 2013-01-29 21:13:34.104857600 +1030 -@@ -65,7 +65,7 @@ ++++ export/OpenColorIO/OpenColorABI.h.in 2013-09-19 22:38:40.141969294 +0930 +@@ -55,6 +55,10 @@ + #include + #define OCIO_SHARED_PTR boost::shared_ptr + #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast ++#elif __cplusplus >= 201103 && defined(_LIBCPP_VERSION) ++#include ++#define OCIO_SHARED_PTR std::shared_ptr ++#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast + #elif __GNUC__ >= 4 + #include + #define OCIO_SHARED_PTR std::tr1::shared_ptr +@@ -65,7 +69,7 @@ // If supported, define OCIOEXPORT, OCIOHIDDEN // (used to choose which symbols to export from OpenColorIO) diff -Nru opencolorio.orig/pkg-plist opencolorio/pkg-plist --- opencolorio.orig/pkg-plist 2013-09-21 18:54:01.755679250 +0930 +++ opencolorio/pkg-plist 2013-09-21 03:45:07.927232696 +0930 @@ -116,7 +116,6 @@ %%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html @dirrm include/OpenColorIO @dirrm include/PyOpenColorIO -@dirrmtry libdata/pkgconfig @dirrm share/ocio %%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide %%PORTDOCS%%@dirrm %%DOCSDIR%%/developers/bindings @@ -132,3 +131,5 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources %%PORTDOCS%%@dirrm %%DOCSDIR%%/_images %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry %%PYTHON_LIBDIR%%/site-packages +@dirrmtry %%PYTHON_LIBDIR%% --------------080207070708000002040701--