svn commit: r457789 - in head/graphics/opencolorio: . files
Kurt Jaeger
pi at FreeBSD.org
Mon Jan 1 18:10:30 UTC 2018
Author: pi
Date: Mon Jan 1 18:10:28 2018
New Revision: 457789
URL: https://svnweb.freebsd.org/changeset/ports/457789
Log:
graphics/opencolorio: update to a newer github commit
- Add support for FLAVORS.
- Update to commit 67e455b97e - this includes six of our patch files.
Remove patches as per above
- Add indirect dependancies
PR: 224380
Submitted by: FreeBSD at ShaneWare.Biz (maintainer)
Changes: https://github.com/imageworks/OpenColorIO/commits/master
Deleted:
head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt
head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt
head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt
Modified:
head/graphics/opencolorio/Makefile
head/graphics/opencolorio/distinfo
head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
head/graphics/opencolorio/files/patch-docs_CMakeLists.txt
head/graphics/opencolorio/pkg-plist-tools
Modified: head/graphics/opencolorio/Makefile
==============================================================================
--- head/graphics/opencolorio/Makefile Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/Makefile Mon Jan 1 18:10:28 2018 (r457789)
@@ -3,7 +3,7 @@
PORTNAME= opencolorio
PORTVERSION= 1.0.9
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= graphics multimedia
MAINTAINER?= FreeBSD at Shaneware.biz
@@ -14,10 +14,12 @@ LICENSE= BSD3CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= imageworks
GH_PROJECT= OpenColorIO
-GH_TAGNAME= a557a85454
+GH_TAGNAME= 67e455b97e
OPTIONS_DEFINE= DOCS
+DOCS_CMAKE_BOOL= OCIO_BUILD_DOCS
+
LDFLAGS+= -L${LOCALBASE}/lib
USES= alias cmake:outsource pkgconfig shebangfix
CMAKE_ARGS= -DOCIO_BUILD_JNIGLUE:BOOL=OFF \
@@ -29,11 +31,11 @@ SHEBANG_FILES= share/sphinx/ExtractRstFromSourceCPP.py
share/sphinx/ExtractRstFromSourceSimple.py \
src/pyglue/createPyDocH.py
-#.if ${MACHINE_CPU:Msse2}
-#CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON
-#.else
-#CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
-#.endif
+.if ${MACHINE_CPU:Msse2}
+CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON
+.else
+CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
+.endif
BROKEN_aarch64= Does not compile: error: use of undeclared identifier __builtin_ia32_emms
BROKEN_armv6= Does not compile: error: use of undeclared identifier __builtin_ia32_emms
@@ -45,18 +47,22 @@ BROKEN_sparc64= Does not compile: error: unrecognized
.include <bsd.port.options.mk>
.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
-LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
+LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
+ libOpenImageIO.so:graphics/openimageio \
libOpenColorIO.so:graphics/opencolorio
CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=ON \
-DOCIO_BUILD_SHARED:BOOL=OFF \
-DOCIO_BUILD_PYGLUE:BOOL=OFF
-USE_GL= glew glut
+USE_GL= gl glu glut glew
+USE_XORG= xi xmu
PLIST= ${PKGDIR}/pkg-plist-tools
EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt \
${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
-LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio
+LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
+ libOpenColorIO.so:graphics/opencolorio
USES+= python
+USE_PYTHON= flavors
CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \
-DOCIO_BUILD_SHARED:BOOL=OFF \
-DOCIO_BUILD_PYGLUE:BOOL=ON \
@@ -80,12 +86,6 @@ CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \
# be used to build a python 3 module
PLIST= ${PKGDIR}/pkg-plist
EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_core_CMakeLists.txt
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=ON
-.else
-CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF
.endif
post-patch:
Modified: head/graphics/opencolorio/distinfo
==============================================================================
--- head/graphics/opencolorio/distinfo Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/distinfo Mon Jan 1 18:10:28 2018 (r457789)
@@ -1,2 +1,3 @@
-SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94
-SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068
+TIMESTAMP = 1474003473
+SHA256 (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = cc932053f9b91c0f8549fe20bbb5d9ebc4c03e0638feac04b16a45dd73c37bc6
+SIZE (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = 13744688
Modified: head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
==============================================================================
--- head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt Mon Jan 1 18:10:28 2018 (r457789)
@@ -1,15 +1,5 @@
--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
+++ src/core/CMakeLists.txt
-@@ -4,8 +4,8 @@
- include_directories(
- ${CMAKE_SOURCE_DIR}/export/
- ${CMAKE_BINARY_DIR}/export/
-- ${EXTERNAL_INCLUDE_DIRS}
- ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+ ${EXTERNAL_INCLUDE_DIRS}
- )
-
- file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
Modified: head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
==============================================================================
--- head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt Mon Jan 1 18:10:28 2018 (r457789)
@@ -1,15 +1,5 @@
--- src/core/CMakeLists.txt.orig 2014-09-12 04:38:18.000000000 +0930
+++ src/core/CMakeLists.txt
-@@ -4,8 +4,8 @@
- include_directories(
- ${CMAKE_SOURCE_DIR}/export/
- ${CMAKE_BINARY_DIR}/export/
-- ${EXTERNAL_INCLUDE_DIRS}
- ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+ ${EXTERNAL_INCLUDE_DIRS}
- )
-
- file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
@@ -81,13 +81,3 @@ if(OCIO_BUILD_STATIC)
install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
endif()
Modified: head/graphics/opencolorio/files/patch-docs_CMakeLists.txt
==============================================================================
--- head/graphics/opencolorio/files/patch-docs_CMakeLists.txt Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/files/patch-docs_CMakeLists.txt Mon Jan 1 18:10:28 2018 (r457789)
@@ -1,24 +1,5 @@
--- docs/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
+++ docs/CMakeLists.txt
-@@ -92,11 +92,16 @@ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h developers/api/OpenColorTransforms.rst)
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
-
-+if(OCIO_BUILD_PYGLUE)
-+ set(DEPLIST OpenColorIO PyOpenColorIO)
-+else()
-+ set(DEPLIST OpenColorIO)
-+endif()
-+
- add_custom_target(doc ALL
- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
- DEPENDS
-- OpenColorIO
-- PyOpenColorIO
-+ ${DEPLIST}
- ${CMAKE_BINARY_DIR}/docs/conf.py
- developers/api/OpenColorIO.rst
- developers/api/OpenColorTransforms.rst
@@ -110,12 +115,11 @@ add_custom_target(doc ALL
add_dependencies(doc Sphinx)
Modified: head/graphics/opencolorio/pkg-plist-tools
==============================================================================
--- head/graphics/opencolorio/pkg-plist-tools Mon Jan 1 17:47:07 2018 (r457788)
+++ head/graphics/opencolorio/pkg-plist-tools Mon Jan 1 18:10:28 2018 (r457789)
@@ -3,8 +3,3 @@ bin/ociocheck
bin/ocioconvert
bin/ociodisplay
bin/ociolutimage
- at comment include/OpenColorIO/OpenColorABI.h
- at comment include/OpenColorIO/OpenColorIO.h
- at comment include/OpenColorIO/OpenColorTransforms.h
- at comment include/OpenColorIO/OpenColorTypes.h
- at comment libdata/pkgconfig/OpenColorIO.pc
More information about the svn-ports-all
mailing list