svn commit: r408830 - in head/graphics: . opencolorio opencolorio-tools opencolorio/files py-opencolorio
Kurt Jaeger
pi at FreeBSD.org
Sat Feb 13 21:58:41 UTC 2016
Author: pi
Date: Sat Feb 13 21:58:38 2016
New Revision: 408830
URL: https://svnweb.freebsd.org/changeset/ports/408830
Log:
graphics/opencolorio: 1.0.8 -> 1.0.9
- Updating to a557a85454 on the master branch.
This is the 1.0.9 release plus some fixes needed to resolve
some build issues.
- Updating slave port graphics/opencolorio-tools
- Adding new slave port graphics/py-opencolorio to allow concurrent
python module installs. Python 2.7 and 3.3+ is supported. py3.2 fails
- graphics/opencolorio uses python2 to generate documentation, using
python3 fails to find the python module in the build dir, as this
only relates to generating the docs we can limit the master port
to py2.7 while there is no issue with py-opencolorio using python
2.7 or 3.3+
PR: 202577
Submitted by: FreeBSD at ShaneWare.Biz (maintainer)
Added:
head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt (contents, props changed)
head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (contents, props changed)
head/graphics/opencolorio/files/patch-docs_CMakeLists.txt
- copied, changed from r408829, head/graphics/opencolorio/files/patch-docs__CMakeLists.txt
head/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
- copied, changed from r408829, head/graphics/opencolorio/files/patch-share__cmake__OCIOMacros.cmake
head/graphics/opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py (contents, props changed)
head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt (contents, props changed)
head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt (contents, props changed)
head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt (contents, props changed)
head/graphics/opencolorio/pkg-plist-pyglue (contents, props changed)
head/graphics/py-opencolorio/
head/graphics/py-opencolorio/Makefile (contents, props changed)
Deleted:
head/graphics/opencolorio/files/patch-docs__CMakeLists.txt
head/graphics/opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in
head/graphics/opencolorio/files/patch-share__cmake__OCIOMacros.cmake
head/graphics/opencolorio/files/patch-src__apps__ocioconvert__CMakeLists.txt
head/graphics/opencolorio/files/patch-src__apps__ociolutimage__CMakeLists.txt
head/graphics/opencolorio/files/patch-src__core__CMakeLists.txt
head/graphics/opencolorio/files/patch-src__core__Platform.h
Modified:
head/graphics/Makefile
head/graphics/opencolorio-tools/Makefile
head/graphics/opencolorio/Makefile
head/graphics/opencolorio/distinfo
head/graphics/opencolorio/files/extra-patch-CMakeLists.txt
head/graphics/opencolorio/pkg-plist
Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/Makefile Sat Feb 13 21:58:38 2016 (r408830)
@@ -845,6 +845,7 @@
SUBDIR += py-mcomix
SUBDIR += py-ming
SUBDIR += py-nwdiag
+ SUBDIR += py-opencolorio
SUBDIR += py-opencv
SUBDIR += py-openexr
SUBDIR += py-opengl
Modified: head/graphics/opencolorio-tools/Makefile
==============================================================================
--- head/graphics/opencolorio-tools/Makefile Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/opencolorio-tools/Makefile Sat Feb 13 21:58:38 2016 (r408830)
@@ -6,10 +6,7 @@ PKGNAMESUFFIX= -tools
COMMENT= Tools to work with OpenColorIO profiles
MASTERDIR= ${.CURDIR}/../opencolorio
+OCIO_SLAVE= tools
OPTIONS_EXCLUDE=DOCS
-USE_GL= glew glut
-
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt
-
.include "${MASTERDIR}/Makefile"
Modified: head/graphics/opencolorio/Makefile
==============================================================================
--- head/graphics/opencolorio/Makefile Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/opencolorio/Makefile Sat Feb 13 21:58:38 2016 (r408830)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= opencolorio
-PORTVERSION= 1.0.8
-DISTVERSIONPREFIX= v
-PORTREVISION?= 3
+PORTVERSION= 1.0.9
+PORTREVISION?= 0
CATEGORIES= graphics multimedia
MAINTAINER?= FreeBSD at Shaneware.biz
@@ -15,42 +14,65 @@ LICENSE= BSD3CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= imageworks
GH_PROJECT= OpenColorIO
+GH_TAGNAME= a557a85454
OPTIONS_DEFINE= DOCS
LDFLAGS+= -L${LOCALBASE}/lib
-PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
-USES= alias cmake:outsource pkgconfig
+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
-
-.if ${MACHINE_CPU:Msse2}
-CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON
-.else
-CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
-.endif
+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
.include <bsd.port.options.mk>
-.if ${SLAVE_PORT} == no
-BUILD_DEPENDS= python:${PORTSDIR}/lang/python
+.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
+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
+USE_GL= glew glut
+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:${PORTSDIR}/graphics/openimageio
+USES+= python
+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:${PORTSDIR}/devel/py-Jinja2
LIB_DEPENDS= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
-USES+= python
+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}
-.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
+# 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}
@@ -62,10 +84,23 @@ CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF
post-patch:
@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.h
+ @${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 <bsd.port.mk>
Modified: head/graphics/opencolorio/distinfo
==============================================================================
--- head/graphics/opencolorio/distinfo Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/opencolorio/distinfo Sat Feb 13 21:58:38 2016 (r408830)
@@ -1,2 +1,2 @@
-SHA256 (imageworks-OpenColorIO-v1.0.8_GH0.tar.gz) = 7bc010f11c033a1d5d37da1f45f83f146458f76dc509c727414df34622f0a736
-SIZE (imageworks-OpenColorIO-v1.0.8_GH0.tar.gz) = 11911728
+SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94
+SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068
Modified: head/graphics/opencolorio/files/extra-patch-CMakeLists.txt
==============================================================================
--- head/graphics/opencolorio/files/extra-patch-CMakeLists.txt Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/opencolorio/files/extra-patch-CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -1,5 +1,5 @@
--- ./CMakeLists.txt.orig 2012-10-07 21:57:35.533351894 +1030
-+++ ./CMakeLists.txt 2012-10-07 21:58:05.952352489 +1030
++++ ./CMakeLists.txt
@@ -375,7 +375,6 @@
configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
Added: head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,18 @@
+--- 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/)
Added: head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,26 @@
+--- 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/)
Copied and modified: head/graphics/opencolorio/files/patch-docs_CMakeLists.txt (from r408829, head/graphics/opencolorio/files/patch-docs__CMakeLists.txt)
==============================================================================
--- head/graphics/opencolorio/files/patch-docs__CMakeLists.txt Sat Feb 13 21:48:14 2016 (r408829, copy source)
+++ head/graphics/opencolorio/files/patch-docs_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -1,6 +1,25 @@
---- ./docs/CMakeLists.txt.orig 2012-04-18 09:38:16.000000000 +0930
-+++ ./docs/CMakeLists.txt 2012-10-08 00:26:42.081351698 +1030
-@@ -98,11 +98,10 @@
+--- 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/
Copied and modified: head/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake (from r408829, head/graphics/opencolorio/files/patch-share__cmake__OCIOMacros.cmake)
==============================================================================
--- head/graphics/opencolorio/files/patch-share__cmake__OCIOMacros.cmake Sat Feb 13 21:48:14 2016 (r408829, copy source)
+++ head/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake Sat Feb 13 21:58:38 2016 (r408830)
@@ -1,20 +1,11 @@
---- ./share/cmake/OCIOMacros.cmake.orig 2012-04-18 09:38:16.000000000 +0930
-+++ ./share/cmake/OCIOMacros.cmake 2012-10-08 00:20:27.666350767 +1030
-@@ -294,7 +294,7 @@
- MACRO(ExtractRstCPP INFILE OUTFILE)
- add_custom_command(
- OUTPUT ${OUTFILE}
-- COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
-+ COMMAND python ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
- DEPENDS ${INFILE}
- COMMENT "Extracting reStructuredText from ${INFILE} (using old process)"
- )
-@@ -303,7 +303,7 @@
- MACRO(ExtractRstSimple INFILE OUTFILE)
- add_custom_command(
- OUTPUT ${OUTFILE}
-- COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
-+ COMMAND python ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
- DEPENDS ${INFILE}
- COMMENT "Extracting reStructuredText from ${INFILE}"
- )
+--- share/cmake/OCIOMacros.cmake.orig 2015-08-29 00:58:36 UTC
++++ share/cmake/OCIOMacros.cmake
+@@ -168,7 +168,7 @@ MACRO(OCIOFindPython)
+ file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
+
+ FIND_LIBRARY(PYTHON_LIBRARY
+- NAMES "python${PYTHON_VERSION}"
++ NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
+ PATHS ${PYTHON_LIBRARY_DIRS}
+ NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
+ )
Added: head/graphics/opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,29 @@
+--- share/sphinx/ExtractRstFromSourceCPP.py.orig 2015-08-23 23:10:32 UTC
++++ share/sphinx/ExtractRstFromSourceCPP.py
+@@ -146,7 +146,7 @@ class Comment:
+
+ if buffer_lines[0] != '':
+ buffer_lines.insert(0, '')
+- for x in xrange(0, len(buffer_lines)):
++ for x in range(0, len(buffer_lines)):
+ buffer_lines[x] = " %s" % buffer_lines[x]
+ buffer_lines.append('')
+ buffer = '\n'.join(buffer_lines)
+@@ -181,7 +181,7 @@ def ExtractRst(string, fileh):
+ indent += 1
+ # remove indent
+ bufa = [buf_lines[0]]
+- for x in xrange(1, len(buf_lines)):
++ for x in range(1, len(buf_lines)):
+ bufa.append(buf_lines[x][indent:])
+ buf = '\n'.join(bufa) + '\n'
+ ##
+@@ -229,7 +229,7 @@ if __name__ == "__main__":
+ sys.exit(1)
+
+ src = open(sys.argv[1]).read()
+- output = file(sys.argv[2], 'w')
++ output = open(sys.argv[2], 'w')
+ ExtractRst(src, output)
+ output.close()
+
Added: head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/patch-src_core__tests_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,12 @@
+--- 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" )
Added: head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/patch-src_jniglue_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,13 @@
+--- 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
Added: head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/files/patch-src_pyglue_CMakeLists.txt Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,24 @@
+--- 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()
+
Modified: head/graphics/opencolorio/pkg-plist
==============================================================================
--- head/graphics/opencolorio/pkg-plist Sat Feb 13 21:48:14 2016 (r408829)
+++ head/graphics/opencolorio/pkg-plist Sat Feb 13 21:58:38 2016 (r408830)
@@ -1,14 +1,16 @@
-include/OpenColorIO/OpenColorTypes.h
-include/OpenColorIO/OpenColorTransforms.h
include/OpenColorIO/OpenColorABI.h
include/OpenColorIO/OpenColorIO.h
+include/OpenColorIO/OpenColorTransforms.h
+include/OpenColorIO/OpenColorTypes.h
include/PyOpenColorIO/PyOpenColorIO.h
-%%PYTHON_SITELIBDIR%%/PyOpenColorIO.so
lib/libOpenColorIO.so
lib/libOpenColorIO.so.1
-lib/libOpenColorIO.so.1.0.8
+lib/libOpenColorIO.so.1.0.9
libdata/pkgconfig/OpenColorIO.pc
-share/ocio/setup_ocio.sh
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
+%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/License.html
%%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
%%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
%%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg
@@ -21,20 +23,23 @@ share/ocio/setup_ocio.sh
%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
%%PORTDOCS%%%%DOCSDIR%%/_sources/ChangeLog.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_pipeline.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonAPI.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTransforms.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTypes.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/coding_guidelines.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/documentation_guidelines.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/getting_started.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/internal_architecture.txt
@@ -42,11 +47,10 @@ share/ocio/setup_ocio.sh
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/submitting_changes.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/contexts.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/index.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/looks.txt
@@ -77,22 +81,21 @@ share/ocio/setup_ocio.sh
%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
-%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_pipeline.html
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
+%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
+%%PORTDOCS%%%%DOCSDIR%%/developers/documentation_guidelines.html
%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
@@ -100,17 +103,17 @@ share/ocio/setup_ocio.sh
%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/genindex.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/License.html
%%PORTDOCS%%%%DOCSDIR%%/objects.inv
%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
%%PORTDOCS%%%%DOCSDIR%%/search.html
%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
%%PORTDOCS%%%%DOCSDIR%%/userguide/baking_luts.html
+%%PORTDOCS%%%%DOCSDIR%%/userguide/config_syntax.html
%%PORTDOCS%%%%DOCSDIR%%/userguide/contexts.html
%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
%%PORTDOCS%%%%DOCSDIR%%/userguide/looks.html
%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
+share/ocio/setup_ocio.sh
Added: head/graphics/opencolorio/pkg-plist-pyglue
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/opencolorio/pkg-plist-pyglue Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1 @@
+%%PYTHON_SITELIBDIR%%/PyOpenColorIO.so
Added: head/graphics/py-opencolorio/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/py-opencolorio/Makefile Sat Feb 13 21:58:38 2016 (r408830)
@@ -0,0 +1,12 @@
+# Created by: Shane Ambler <FreeBSD at Shaneware.biz>
+# $FreeBSD$
+
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+COMMENT= OpenColorIO python bindings
+
+MASTERDIR= ${.CURDIR}/../opencolorio
+OCIO_SLAVE= pymodule
+OPTIONS_EXCLUDE=DOCS
+
+.include "${MASTERDIR}/Makefile"
More information about the svn-ports-all
mailing list