From owner-svn-ports-head@FreeBSD.ORG Wed Oct 23 19:11:12 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 1EE3CB3F; Wed, 23 Oct 2013 19:11:12 +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 E703C272F; Wed, 23 Oct 2013 19:11:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJBBWq008352; Wed, 23 Oct 2013 19:11:11 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJBBId008350; Wed, 23 Oct 2013 19:11:11 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310231911.r9NJBBId008350@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 23 Oct 2013 19:11:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331415 - in head/graphics: opencolorio opencolorio-tools 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 19:11:12 -0000 Author: tijl Date: Wed Oct 23 19:11:11 2013 New Revision: 331415 URL: http://svnweb.freebsd.org/changeset/ports/331415 Log: Move more bits from opencolorio-tools to opencolorio. Submitted by: Shane Ambler (maintainer) Modified: head/graphics/opencolorio-tools/Makefile head/graphics/opencolorio/Makefile Modified: head/graphics/opencolorio-tools/Makefile ============================================================================== --- head/graphics/opencolorio-tools/Makefile Wed Oct 23 19:10:37 2013 (r331414) +++ head/graphics/opencolorio-tools/Makefile Wed Oct 23 19:11:11 2013 (r331415) @@ -1,24 +1,13 @@ # Created by: Shane Ambler # $FreeBSD$ -PORTREVISION= 0 PKGNAMESUFFIX= -tools COMMENT= Tools to work with OpenColorIO profiles -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 - USE_GL= glew glut EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt Modified: head/graphics/opencolorio/Makefile ============================================================================== --- head/graphics/opencolorio/Makefile Wed Oct 23 19:10:37 2013 (r331414) +++ head/graphics/opencolorio/Makefile Wed Oct 23 19:11:11 2013 (r331415) @@ -17,11 +17,14 @@ GH_PROJECT= OpenColorIO GH_TAGNAME= v${PORTVERSION} GH_COMMIT= 8883824 -OPTIONS_DEFINE= DOCS - LDFLAGS+= -L${LOCALBASE}/lib PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} USES= cmake:outsource pkgconfig +CMAKE_ARGS= -DOCIO_BUILD_JNIGLUE:BOOL=OFF \ + -DOCIO_BUILD_NUKE:BOOL=OFF \ + -DOCIO_BUILD_STATIC:BOOL=OFF \ + -DUSE_EXTERNAL_TINYXML:BOOL=ON \ + -DUSE_EXTERNAL_YAML:BOOL=ON .if ${MACHINE_CPU:Msse2} CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON @@ -32,17 +35,19 @@ CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF .include .if ${SLAVE_PORT} == no -LIB_DEPENDS+= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \ +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 + -DOCIO_BUILD_SHARED:BOOL=ON \ + -DOCIO_BUILD_PYGLUE:BOOL=ON +.else +LIB_DEPENDS= libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \ + libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio +CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=ON \ + -DOCIO_BUILD_SHARED:BOOL=OFF \ + -DOCIO_BUILD_PYGLUE:BOOL=OFF .endif .if ${PORT_OPTIONS:MDOCS}