Date: Wed, 23 Oct 2013 19:11:11 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> 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 Message-ID: <201310231911.r9NJBBId008350@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <FreeBSD@Shaneware.biz> (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@Shaneware.biz> # $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 <bsd.port.options.mk> .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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231911.r9NJBBId008350>