diff -Nru opencolorio.orig/Makefile opencolorio/Makefile --- opencolorio.orig/Makefile 2015-08-29 22:41:58.492118526 +0930 +++ opencolorio/Makefile 2015-08-29 01:07:10.987113604 +0930 @@ -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@Shaneware.biz @@ -15,17 +14,20 @@ 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 +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 @@ -35,22 +37,42 @@ .include -.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 @@ 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 diff -Nru opencolorio.orig/distinfo opencolorio/distinfo --- opencolorio.orig/distinfo 2015-08-29 22:41:58.498858144 +0930 +++ opencolorio/distinfo 2015-06-19 03:22:57.114891913 +0930 @@ -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 diff -Nru opencolorio.orig/files/extra-patch-CMakeLists.txt opencolorio/files/extra-patch-CMakeLists.txt --- opencolorio.orig/files/extra-patch-CMakeLists.txt 2015-08-29 22:41:58.426856744 +0930 +++ opencolorio/files/extra-patch-CMakeLists.txt 2015-08-27 01:42:04.557877571 +0930 @@ -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) diff -Nru opencolorio.orig/files/extra-patch-src_core_CMakeLists.txt opencolorio/files/extra-patch-src_core_CMakeLists.txt --- opencolorio.orig/files/extra-patch-src_core_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/extra-patch-src_core_CMakeLists.txt 2015-06-19 03:22:57.114891913 +0930 @@ -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/) diff -Nru opencolorio.orig/files/extra-tools-patch-src_core_CMakeLists.txt opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt --- opencolorio.orig/files/extra-tools-patch-src_core_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt 2015-08-27 01:41:57.733878114 +0930 @@ -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/) diff -Nru opencolorio.orig/files/patch-docs_CMakeLists.txt opencolorio/files/patch-docs_CMakeLists.txt --- opencolorio.orig/files/patch-docs_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-docs_CMakeLists.txt 2015-08-28 22:34:47.760743138 +0930 @@ -0,0 +1,36 @@ +--- 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 diff -Nru opencolorio.orig/files/patch-docs__CMakeLists.txt opencolorio/files/patch-docs__CMakeLists.txt --- opencolorio.orig/files/patch-docs__CMakeLists.txt 2015-08-29 22:41:58.428617161 +0930 +++ opencolorio/files/patch-docs__CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 @@ -1,17 +0,0 @@ ---- ./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 @@ - 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 diff -Nru opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.h.in opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in --- opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.h.in 2015-08-29 22:41:58.409758617 +0930 +++ opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in 1970-01-01 09:30:00.000000000 +0930 @@ -1,22 +0,0 @@ ---- export/OpenColorIO/OpenColorABI.h.in.orig 2012-12-12 09:51:23.000000000 +1030 -+++ export/OpenColorIO/OpenColorABI.h.in 2013-01-29 21:13:34.104857600 +1030 -@@ -55,6 +55,10 @@ - #include - #define OCIO_SHARED_PTR boost::shared_ptr - #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast -+#elif defined(_LIBCPP_VERSION) -+#include -+#define OCIO_SHARED_PTR std::shared_ptr -+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast - #elif __GNUC__ >= 4 - #include - #define OCIO_SHARED_PTR std::tr1::shared_ptr -@@ -65,7 +65,7 @@ - - // If supported, define OCIOEXPORT, OCIOHIDDEN - // (used to choose which symbols to export from OpenColorIO) --#if defined __linux__ || __APPLE__ -+#if defined __linux__ || __APPLE__ || __FreeBSD__ - #if __GNUC__ >= 4 - #define OCIOEXPORT __attribute__ ((visibility("default"))) - #define OCIOHIDDEN __attribute__ ((visibility("hidden"))) diff -Nru opencolorio.orig/files/patch-share__cmake__OCIOMacros.cmake opencolorio/files/patch-share__cmake__OCIOMacros.cmake --- opencolorio.orig/files/patch-share__cmake__OCIOMacros.cmake 2015-08-29 22:41:58.428758871 +0930 +++ opencolorio/files/patch-share__cmake__OCIOMacros.cmake 1970-01-01 09:30:00.000000000 +0930 @@ -1,20 +0,0 @@ ---- ./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}" - ) diff -Nru opencolorio.orig/files/patch-share_cmake_OCIOMacros.cmake opencolorio/files/patch-share_cmake_OCIOMacros.cmake --- opencolorio.orig/files/patch-share_cmake_OCIOMacros.cmake 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-share_cmake_OCIOMacros.cmake 2015-08-29 01:00:48.673139377 +0930 @@ -0,0 +1,11 @@ +--- 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 + ) diff -Nru opencolorio.orig/files/patch-share_sphinx_ExtractRstFromSourceCPP.py opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py --- opencolorio.orig/files/patch-share_sphinx_ExtractRstFromSourceCPP.py 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py 2015-08-27 01:57:27.251814577 +0930 @@ -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() + diff -Nru opencolorio.orig/files/patch-src__apps__ocioconvert__CMakeLists.txt opencolorio/files/patch-src__apps__ocioconvert__CMakeLists.txt --- opencolorio.orig/files/patch-src__apps__ocioconvert__CMakeLists.txt 2015-08-29 22:41:58.420019583 +0930 +++ opencolorio/files/patch-src__apps__ocioconvert__CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 @@ -1,11 +0,0 @@ ---- ./src/apps/ocioconvert/CMakeLists.txt.orig 2012-04-18 09:38:16.000000000 +0930 -+++ ./src/apps/ocioconvert/CMakeLists.txt 2012-10-07 21:56:32.462351272 +1030 -@@ -10,7 +10,7 @@ - - add_executable(ocioconvert ${share_src_files} main.cpp) - -- target_link_libraries(ocioconvert ${OIIO_LIBRARIES} OpenColorIO dl) -+ target_link_libraries(ocioconvert ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS}) - - install(TARGETS ocioconvert DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() diff -Nru opencolorio.orig/files/patch-src__apps__ociolutimage__CMakeLists.txt opencolorio/files/patch-src__apps__ociolutimage__CMakeLists.txt --- opencolorio.orig/files/patch-src__apps__ociolutimage__CMakeLists.txt 2015-08-29 22:41:58.428758871 +0930 +++ opencolorio/files/patch-src__apps__ociolutimage__CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 @@ -1,11 +0,0 @@ ---- ./src/apps/ociolutimage/CMakeLists.txt.orig 2012-04-18 09:38:16.000000000 +0930 -+++ ./src/apps/ociolutimage/CMakeLists.txt 2012-10-07 21:56:32.463351075 +1030 -@@ -10,7 +10,7 @@ - - add_executable(ociolutimage ${share_src_files} main.cpp) - -- target_link_libraries(ociolutimage ${OIIO_LIBRARIES} OpenColorIO dl) -+ target_link_libraries(ociolutimage ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS}) - - install(TARGETS ociolutimage DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() diff -Nru opencolorio.orig/files/patch-src__core__CMakeLists.txt opencolorio/files/patch-src__core__CMakeLists.txt --- opencolorio.orig/files/patch-src__core__CMakeLists.txt 2015-08-29 22:41:58.385375646 +0930 +++ opencolorio/files/patch-src__core__CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 @@ -1,8 +0,0 @@ ---- ./src/core/CMakeLists.txt.orig 2012-04-18 09:38:16.000000000 +0930 -+++ ./src/core/CMakeLists.txt 2012-10-08 00:20:27.667351098 +1030 -@@ -90,4 +90,4 @@ - 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/) diff -Nru opencolorio.orig/files/patch-src__core__Platform.h opencolorio/files/patch-src__core__Platform.h --- opencolorio.orig/files/patch-src__core__Platform.h 2015-08-29 22:41:58.428758871 +0930 +++ opencolorio/files/patch-src__core__Platform.h 1970-01-01 09:30:00.000000000 +0930 @@ -1,12 +0,0 @@ ---- ./src/core/Platform.h.orig 2012-04-18 09:38:16.000000000 +0930 -+++ ./src/core/Platform.h 2012-10-08 00:20:27.668352332 +1030 -@@ -85,7 +85,9 @@ - - // linux/unix/posix - #include -+#if !defined(__FreeBSD__) - #include -+#endif - #include - #include - // OS for spinlock diff -Nru opencolorio.orig/files/patch-src_core__tests_CMakeLists.txt opencolorio/files/patch-src_core__tests_CMakeLists.txt --- opencolorio.orig/files/patch-src_core__tests_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-src_core__tests_CMakeLists.txt 2015-06-19 03:22:57.114891913 +0930 @@ -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" ) diff -Nru opencolorio.orig/files/patch-src_jniglue_CMakeLists.txt opencolorio/files/patch-src_jniglue_CMakeLists.txt --- opencolorio.orig/files/patch-src_jniglue_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-src_jniglue_CMakeLists.txt 2015-06-19 03:22:57.115882166 +0930 @@ -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 diff -Nru opencolorio.orig/files/patch-src_pyglue_CMakeLists.txt opencolorio/files/patch-src_pyglue_CMakeLists.txt --- opencolorio.orig/files/patch-src_pyglue_CMakeLists.txt 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/files/patch-src_pyglue_CMakeLists.txt 2015-06-19 03:22:57.115882166 +0930 @@ -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() + diff -Nru opencolorio.orig/pkg-plist opencolorio/pkg-plist --- opencolorio.orig/pkg-plist 2015-08-29 22:41:58.454990639 +0930 +++ opencolorio/pkg-plist 2015-08-29 00:33:15.505253703 +0930 @@ -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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 diff -Nru opencolorio.orig/pkg-plist-pyglue opencolorio/pkg-plist-pyglue --- opencolorio.orig/pkg-plist-pyglue 1970-01-01 09:30:00.000000000 +0930 +++ opencolorio/pkg-plist-pyglue 2015-08-29 00:53:58.576168309 +0930 @@ -0,0 +1 @@ +%%PYTHON_SITELIBDIR%%/PyOpenColorIO.so diff -Nru opencolorio-tools.orig/Makefile opencolorio-tools/Makefile --- opencolorio-tools.orig/Makefile 2015-08-29 22:52:21.544841811 +0930 +++ opencolorio-tools/Makefile 2015-08-26 17:52:47.730818737 +0930 @@ -6,10 +6,7 @@ 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" diff -Nru py-opencolorio.orig/Makefile py-opencolorio/Makefile --- py-opencolorio.orig/Makefile 1970-01-01 09:30:00.000000000 +0930 +++ py-opencolorio/Makefile 2015-08-26 23:22:13.881456596 +0930 @@ -0,0 +1,12 @@ +# Created by: Shane Ambler +# $FreeBSD$ + +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +COMMENT= OpenColorIO python bindings + +MASTERDIR= ${.CURDIR}/../opencolorio +OCIO_SLAVE= pymodule +OPTIONS_EXCLUDE=DOCS + +.include "${MASTERDIR}/Makefile"