From owner-svn-ports-head@FreeBSD.ORG Wed Oct 23 18:50:18 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 5A2AC61B; Wed, 23 Oct 2013 18:50:18 +0000 (UTC) (envelope-from tijl@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 473232507; Wed, 23 Oct 2013 18:50:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIoIpa098054; Wed, 23 Oct 2013 18:50:18 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIoH99098049; Wed, 23 Oct 2013 18:50:17 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310231850.r9NIoH99098049@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 23 Oct 2013 18:50:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331405 - in head/graphics: opencolorio opencolorio-tools opencolorio/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: Wed, 23 Oct 2013 18:50:18 -0000 Author: tijl Date: Wed Oct 23 18:50:17 2013 New Revision: 331405 URL: http://svnweb.freebsd.org/changeset/ports/331405 Log: - Fix build with libc++. - Support staging. - Rearrange bits between opencolorio and opencolorio-tools. PR: ports/182220 Approved by: Shane Ambler (maintainer) Modified: head/graphics/opencolorio-tools/Makefile head/graphics/opencolorio/Makefile head/graphics/opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in head/graphics/opencolorio/pkg-plist Modified: head/graphics/opencolorio-tools/Makefile ============================================================================== --- head/graphics/opencolorio-tools/Makefile Wed Oct 23 18:39:25 2013 (r331404) +++ head/graphics/opencolorio-tools/Makefile Wed Oct 23 18:50:17 2013 (r331405) @@ -1,33 +1,30 @@ # Created by: Shane Ambler # $FreeBSD$ -PORTNAME= opencolorio PORTREVISION= 0 PKGNAMESUFFIX= -tools COMMENT= Tools to work with OpenColorIO profiles -LICENSE= BSD - LIB_DEPENDS= OpenImageIO:${PORTSDIR}/graphics/openimageio \ OpenColorIO:${PORTSDIR}/graphics/opencolorio MASTERDIR= ${.CURDIR}/../opencolorio +OPTIONS_EXCLUDE=DOCS CMAKE_ARGS= -DOCIO_BUILD_APPS:BOOL=ON \ -DOCIO_BUILD_JNIGLUE:BOOL=OFF \ -DOCIO_BUILD_NUKE:BOOL=OFF \ -DOCIO_BUILD_PYGLUE:BOOL=OFF \ -DOCIO_BUILD_SHARED:BOOL=OFF \ - -DOCIO_BUILD_STATIC:BOOL=OFF \ - -DOCIO_BUILD_DOCS:BOOL=OFF + -DOCIO_BUILD_STATIC:BOOL=OFF USE_GL= glew glut -CFLAGS+= -L${LOCALBASE}/lib EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt -OCIO_TOOLS= yes +post-patch: + @${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \ + ${REINPLACE_CMD} '/namespace OIIO/d' -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/graphics/opencolorio/Makefile ============================================================================== --- head/graphics/opencolorio/Makefile Wed Oct 23 18:39:25 2013 (r331404) +++ head/graphics/opencolorio/Makefile Wed Oct 23 18:50:17 2013 (r331405) @@ -1,15 +1,15 @@ # Created by: Shane Ambler # $FreeBSD$ -PORTNAME?= opencolorio +PORTNAME= opencolorio PORTVERSION= 1.0.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= Complete color management solution -LICENSE?= BSD +LICENSE= BSD USE_GITHUB= yes GH_ACCOUNT= imageworks @@ -17,54 +17,38 @@ GH_PROJECT= OpenColorIO GH_TAGNAME= v${PORTVERSION} GH_COMMIT= 8883824 -.if !defined(OCIO_TOOLS) -USE_PYTHON= 2.6+ -USE_LDCONFIG= yes -.endif - -USES= cmake:outsource -CMAKE_ARGS?= -DOCIO_BUILD_APPS:BOOL=OFF \ - -DOCIO_BUILD_JNIGLUE:BOOL=OFF \ - -DOCIO_BUILD_NUKE:BOOL=OFF \ - -DOCIO_BUILD_STATIC:BOOL=OFF \ - -DOCIO_BUILD_PYGLUE:BOOL=ON - -MAKE_JOBS_SAFE?= yes +OPTIONS_DEFINE= DOCS +LDFLAGS+= -L${LOCALBASE}/lib PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} +USES= cmake:outsource pkgconfig -.if !defined(OCIO_TOOLS) -OPTIONS_DEFINE= DOCS SSE -OPTIONS_DEFAULT= DOCS SSE -.endif - -NO_STAGE= yes -.include - -.if empty(PORT_OPTIONS:MDOCS) || defined(OCIO_TOOLS) -CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF -.else -CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MSSE} +.if ${MACHINE_CPU:Msse2} CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON .else CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF .endif -.include +.include -.if ${CC:T} == "clang" && ${ARCH} == "i386" && ${OSVERSION} < 901000 -# workaround for pr/165968 -# was fixed in 9-STABLE before 9.1-RELEASE but not passed into 9-RELEASE -CFLAGS+= -march=pentium2 +.if ${SLAVE_PORT} == no +LIB_DEPENDS+= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \ + libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp +USE_PYTHON= 2.6+ +USE_LDCONFIG= yes +CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \ + -DOCIO_BUILD_JNIGLUE:BOOL=OFF \ + -DOCIO_BUILD_NUKE:BOOL=OFF \ + -DOCIO_BUILD_STATIC:BOOL=OFF \ + -DOCIO_BUILD_PYGLUE:BOOL=ON \ + -DUSE_EXTERNAL_TINYXML:BOOL=ON \ + -DUSE_EXTERNAL_YAML:BOOL=ON .endif -post-patch: -.if defined(OCIO_TOOLS) - @${FIND} ${WRKSRC}/src/apps -name "main.cpp" -exec \ - ${REINPLACE_CMD} -e 's|namespace OIIO|//namespace OIIO|g' "{}" \; +.if ${PORT_OPTIONS:MDOCS} +CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=ON +.else +CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF .endif -.include +.include Modified: head/graphics/opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in ============================================================================== --- head/graphics/opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in Wed Oct 23 18:39:25 2013 (r331404) +++ head/graphics/opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in Wed Oct 23 18:50:17 2013 (r331405) @@ -1,5 +1,16 @@ --- 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 +@@ -55,6 +55,10 @@ + #include + #define OCIO_SHARED_PTR boost::shared_ptr + #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast ++#elif 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 +65,7 @@ // If supported, define OCIOEXPORT, OCIOHIDDEN Modified: head/graphics/opencolorio/pkg-plist ============================================================================== --- head/graphics/opencolorio/pkg-plist Wed Oct 23 18:39:25 2013 (r331404) +++ head/graphics/opencolorio/pkg-plist Wed Oct 23 18:50:17 2013 (r331405) @@ -116,7 +116,6 @@ share/ocio/setup_ocio.sh %%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 @@ share/ocio/setup_ocio.sh %%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources %%PORTDOCS%%@dirrm %%DOCSDIR%%/_images %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%%