Index: head/graphics/opencolorio/Makefile =================================================================== --- head/graphics/opencolorio/Makefile (revision 457788) +++ head/graphics/opencolorio/Makefile (revision 457789) @@ -1,113 +1,113 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= opencolorio PORTVERSION= 1.0.9 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= Complete color management solution 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 \ -DOCIO_BUILD_NUKE:BOOL=OFF \ -DOCIO_BUILD_STATIC:BOOL=OFF \ -DUSE_EXTERNAL_TINYXML:BOOL=ON \ -DUSE_EXTERNAL_YAML:BOOL=ON 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 BROKEN_armv7= Does not compile: error: use of undeclared identifier __builtin_ia32_emms BROKEN_mips64= Does not compile: error: unrecognized command line option -msse2 BROKEN_powerpc64= Does not compile: error: unrecognized command line option -msse2 BROKEN_sparc64= Does not compile: error: unrecognized command line option -msse2 .include .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 \ -DPYTHON:STRING=${PYTHON_CMD} PLIST= ${PKGDIR}/pkg-plist-pyglue .else # master port BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp03.so:devel/yaml-cpp03 USES+= python:2,build USE_LDCONFIG= yes CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \ -DOCIO_BUILD_SHARED:BOOL=ON \ -DOCIO_BUILD_PYGLUE:BOOL=ON \ -DPYTHON:FILEPATH=${PYTHON_CMD} # we enable pyglue in master port. This makes the python module # available when generating docs, we leave the python header in place # but only install the python module with the py-opencolorio port # this makes it easier to allow multiple python versions installed # doc building fails using python3 - but the py-opencolorio port can still # 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: @${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/YAML_CPP_INCLUDE_DIR/ s|yaml-cpp|&03|' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/YAML_CPP_LIBRARY/ s|yaml-cpp|&03|' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp .if ${SLAVE_PORT} == yes @${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \ ${REINPLACE_CMD} '/namespace OIIO/d' .endif .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule do-install: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/src/pyglue/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} .elif !defined(OCIO_SLAVE) post-install: @${RM} -R ${STAGEDIR}${PYTHON_LIBDIR} .endif .include Index: head/graphics/opencolorio/distinfo =================================================================== --- head/graphics/opencolorio/distinfo (revision 457788) +++ head/graphics/opencolorio/distinfo (revision 457789) @@ -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 Index: head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt (nonexistent) @@ -1,12 +0,0 @@ ---- src/core_tests/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC -+++ src/core_tests/CMakeLists.txt -@@ -7,8 +7,8 @@ add_definitions("-DOCIO_SOURCE_DIR=${CMA - 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_test_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp" ) Property changes on: head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- src/jniglue/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC -+++ src/jniglue/CMakeLists.txt -@@ -1,9 +1,9 @@ - - include_directories( -- ${JNI_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/export/ - ${CMAKE_BINARY_DIR}/export/ -+ ${JNI_INCLUDE_DIRS} - ) - - set(JNIOCIO_CLASSES Property changes on: head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt (nonexistent) @@ -1,24 +0,0 @@ ---- src/pyglue/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC -+++ src/pyglue/CMakeLists.txt -@@ -31,18 +31,18 @@ add_library(PyOpenColorIO MODULE ${pyglu - - if(OCIO_USE_BOOST_PTR) - include_directories( -- ${PYTHON_INCLUDE} -- ${Boost_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/export/ - ${CMAKE_BINARY_DIR}/export/ - ${CMAKE_CURRENT_BINARY_DIR} -+ ${PYTHON_INCLUDE} -+ ${Boost_INCLUDE_DIR} - ) - else() - include_directories( -- ${PYTHON_INCLUDE} - ${CMAKE_SOURCE_DIR}/export/ - ${CMAKE_BINARY_DIR}/export/ - ${CMAKE_CURRENT_BINARY_DIR} -+ ${PYTHON_INCLUDE} - ) - endif() - Property changes on: head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt (revision 457789) @@ -1,18 +1,8 @@ --- 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) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc - DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) + DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/) Index: head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (revision 457789) @@ -1,26 +1,16 @@ --- 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() -# public interface -install(FILES ${core_export_headers} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/) - -# pkg-config -message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in") -configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc - DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) Index: head/graphics/opencolorio/files/patch-docs_CMakeLists.txt =================================================================== --- head/graphics/opencolorio/files/patch-docs_CMakeLists.txt (revision 457788) +++ head/graphics/opencolorio/files/patch-docs_CMakeLists.txt (revision 457789) @@ -1,36 +1,17 @@ --- 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) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio PATTERN .* EXCLUDE ) -find_package(LATEX) -if(PDFLATEX_COMPILER) +if(0) add_custom_target(latex COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex Index: head/graphics/opencolorio/pkg-plist-tools =================================================================== --- head/graphics/opencolorio/pkg-plist-tools (revision 457788) +++ head/graphics/opencolorio/pkg-plist-tools (revision 457789) @@ -1,10 +1,5 @@ bin/ociobakelut bin/ociocheck bin/ocioconvert bin/ociodisplay bin/ociolutimage -@comment include/OpenColorIO/OpenColorABI.h -@comment include/OpenColorIO/OpenColorIO.h -@comment include/OpenColorIO/OpenColorTransforms.h -@comment include/OpenColorIO/OpenColorTypes.h -@comment libdata/pkgconfig/OpenColorIO.pc