From 8c65b19716c02cd18a8e7ab6627d7b716c241436 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 23 Oct 2013 19:11:11 +0000 Subject: [PATCH] Move more bits from opencolorio-tools to opencolorio. Submitted by: Shane Ambler (maintainer) --- graphics/opencolorio-tools/Makefile | 11 ----------- graphics/opencolorio/Makefile | 23 ++++++++++++++--------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/graphics/opencolorio-tools/Makefile b/graphics/opencolorio-tools/Makefile index 37881763439a..a89208e29261 100644 --- a/graphics/opencolorio-tools/Makefile +++ b/graphics/opencolorio-tools/Makefile @@ -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 diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile index 2d7f6f83fd44..87a451b2e7e7 100644 --- a/graphics/opencolorio/Makefile +++ b/graphics/opencolorio/Makefile @@ -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}