View | Details | Raw Unified | Return to bug 202577 | Differences between
and this patch

Collapse All | Expand All

(-)opencolorio/Makefile (-15 / +50 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	opencolorio
4
PORTNAME=	opencolorio
5
PORTVERSION=	1.0.8
5
PORTVERSION=	1.0.9
6
DISTVERSIONPREFIX=	v
6
PORTREVISION?=	0
7
PORTREVISION?=	3
8
CATEGORIES=	graphics multimedia
7
CATEGORIES=	graphics multimedia
9
8
10
MAINTAINER?=	FreeBSD@Shaneware.biz
9
MAINTAINER?=	FreeBSD@Shaneware.biz
Lines 15-31 Link Here
15
USE_GITHUB=	yes
14
USE_GITHUB=	yes
16
GH_ACCOUNT=	imageworks
15
GH_ACCOUNT=	imageworks
17
GH_PROJECT=	OpenColorIO
16
GH_PROJECT=	OpenColorIO
17
GH_TAGNAME=	a557a85454
18
18
19
OPTIONS_DEFINE=	DOCS
19
OPTIONS_DEFINE=	DOCS
20
20
21
LDFLAGS+=	-L${LOCALBASE}/lib
21
LDFLAGS+=	-L${LOCALBASE}/lib
22
PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
22
USES=		alias cmake:outsource pkgconfig shebangfix
23
USES=		alias cmake:outsource pkgconfig
24
CMAKE_ARGS=	-DOCIO_BUILD_JNIGLUE:BOOL=OFF \
23
CMAKE_ARGS=	-DOCIO_BUILD_JNIGLUE:BOOL=OFF \
25
		-DOCIO_BUILD_NUKE:BOOL=OFF \
24
		-DOCIO_BUILD_NUKE:BOOL=OFF \
26
		-DOCIO_BUILD_STATIC:BOOL=OFF \
25
		-DOCIO_BUILD_STATIC:BOOL=OFF \
27
		-DUSE_EXTERNAL_TINYXML:BOOL=ON \
26
		-DUSE_EXTERNAL_TINYXML:BOOL=ON \
28
		-DUSE_EXTERNAL_YAML:BOOL=ON
27
		-DUSE_EXTERNAL_YAML:BOOL=ON
28
SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py \
29
		share/sphinx/ExtractRstFromSourceSimple.py \
30
		src/pyglue/createPyDocH.py
29
31
30
.if ${MACHINE_CPU:Msse2}
32
.if ${MACHINE_CPU:Msse2}
31
CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
33
CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
Lines 35-56 Link Here
35
37
36
.include <bsd.port.options.mk>
38
.include <bsd.port.options.mk>
37
39
38
.if ${SLAVE_PORT} == no
40
.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
39
BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
41
LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
42
		libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
43
CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=ON \
44
		-DOCIO_BUILD_SHARED:BOOL=OFF \
45
		-DOCIO_BUILD_PYGLUE:BOOL=OFF
46
USE_GL=		glew glut
47
PLIST=		${PKGDIR}/pkg-plist-tools
48
EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt \
49
		${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
50
.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
51
LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
52
USES+=		python
53
CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
54
		-DOCIO_BUILD_SHARED:BOOL=OFF \
55
		-DOCIO_BUILD_PYGLUE:BOOL=ON \
56
		-DPYTHON:STRING=${PYTHON_CMD}
57
PLIST=		${PKGDIR}/pkg-plist-pyglue
58
.else # master port
59
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2
40
LIB_DEPENDS=	libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
60
LIB_DEPENDS=	libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
41
		libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
61
		libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
42
USES+=		python
62
USES+=		python:2,build
43
USE_LDCONFIG=	yes
63
USE_LDCONFIG=	yes
44
CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
64
CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
45
		-DOCIO_BUILD_SHARED:BOOL=ON \
65
		-DOCIO_BUILD_SHARED:BOOL=ON \
46
		-DOCIO_BUILD_PYGLUE:BOOL=ON \
66
		-DOCIO_BUILD_PYGLUE:BOOL=ON \
47
		-DPYTHON:FILEPATH=${PYTHON_CMD}
67
		-DPYTHON:FILEPATH=${PYTHON_CMD}
48
.else
68
# we enable pyglue in master port. This makes the python module
49
LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
69
# available when generating docs, we leave the python header in place
50
		libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
70
# but only install the python module with the py-opencolorio port
51
CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=ON \
71
# this makes it easier to allow multiple python versions installed
52
		-DOCIO_BUILD_SHARED:BOOL=OFF \
72
# doc building fails using python3 - but the py-opencolorio port can still
53
		-DOCIO_BUILD_PYGLUE:BOOL=OFF
73
# be used to build a python 3 module
74
PLIST=		${PKGDIR}/pkg-plist
75
EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_core_CMakeLists.txt
54
.endif
76
.endif
55
77
56
.if ${PORT_OPTIONS:MDOCS}
78
.if ${PORT_OPTIONS:MDOCS}
Lines 62-71 Link Here
62
post-patch:
84
post-patch:
63
	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
85
	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
64
		${WRKSRC}/CMakeLists.txt
86
		${WRKSRC}/CMakeLists.txt
65
	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.h
87
	@${REINPLACE_CMD} -e '/YAML_CPP_INCLUDE_DIR/ s|yaml-cpp|&03|' \
88
		${WRKSRC}/CMakeLists.txt
89
	@${REINPLACE_CMD} -e '/YAML_CPP_LIBRARY/ s|yaml-cpp|&03|' \
90
		${WRKSRC}/CMakeLists.txt
91
	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp
66
.if ${SLAVE_PORT} == yes
92
.if ${SLAVE_PORT} == yes
67
	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
93
	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
68
		${REINPLACE_CMD} '/namespace OIIO/d'
94
		${REINPLACE_CMD} '/namespace OIIO/d'
69
.endif
95
.endif
70
96
97
.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
98
do-install:
99
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
100
	${INSTALL_LIB} ${BUILD_WRKSRC}/src/pyglue/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
101
.elif !defined(OCIO_SLAVE)
102
post-install:
103
	@${RM} -R ${STAGEDIR}${PYTHON_LIBDIR}
104
.endif
105
71
.include <bsd.port.mk>
106
.include <bsd.port.mk>
(-)opencolorio/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (imageworks-OpenColorIO-v1.0.8_GH0.tar.gz) = 7bc010f11c033a1d5d37da1f45f83f146458f76dc509c727414df34622f0a736
1
SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94
2
SIZE (imageworks-OpenColorIO-v1.0.8_GH0.tar.gz) = 11911728
2
SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068
(-)opencolorio/files/extra-patch-CMakeLists.txt (-1 / +1 lines)
Lines 1-5 Link Here
1
--- ./CMakeLists.txt.orig	2012-10-07 21:57:35.533351894 +1030
1
--- ./CMakeLists.txt.orig	2012-10-07 21:57:35.533351894 +1030
2
+++ ./CMakeLists.txt	2012-10-07 21:58:05.952352489 +1030
2
+++ ./CMakeLists.txt
3
@@ -375,7 +375,6 @@
3
@@ -375,7 +375,6 @@
4
 configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
4
 configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
5
     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
5
     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
(-)opencolorio/files/extra-patch-src_core_CMakeLists.txt (+18 lines)
Line 0 Link Here
1
--- src/core/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
2
+++ src/core/CMakeLists.txt
3
@@ -4,8 +4,8 @@
4
 include_directories(
5
     ${CMAKE_SOURCE_DIR}/export/
6
     ${CMAKE_BINARY_DIR}/export/
7
-    ${EXTERNAL_INCLUDE_DIRS}
8
     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
9
+    ${EXTERNAL_INCLUDE_DIRS}
10
 )
11
 
12
 file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
13
@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
14
 configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
15
     ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
16
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
17
-    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
18
+    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)
(-)opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (+26 lines)
Line 0 Link Here
1
--- src/core/CMakeLists.txt.orig	2014-09-12 04:38:18.000000000 +0930
2
+++ src/core/CMakeLists.txt
3
@@ -4,8 +4,8 @@
4
 include_directories(
5
     ${CMAKE_SOURCE_DIR}/export/
6
     ${CMAKE_BINARY_DIR}/export/
7
-    ${EXTERNAL_INCLUDE_DIRS}
8
     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
9
+    ${EXTERNAL_INCLUDE_DIRS}
10
 )
11
 
12
 file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
13
@@ -81,13 +81,3 @@ if(OCIO_BUILD_STATIC)
14
     install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
15
 endif()
16
 
17
-# public interface
18
-install(FILES ${core_export_headers}
19
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
20
-
21
-# pkg-config
22
-message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
23
-configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
24
-    ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
25
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
26
-    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
(-)opencolorio/files/patch-docs_CMakeLists.txt (+36 lines)
Line 0 Link Here
1
--- docs/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
2
+++ docs/CMakeLists.txt
3
@@ -92,11 +92,16 @@ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export
4
 ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h developers/api/OpenColorTransforms.rst)
5
 ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
6
 
7
+if(OCIO_BUILD_PYGLUE)
8
+        set(DEPLIST OpenColorIO PyOpenColorIO)
9
+else()
10
+        set(DEPLIST OpenColorIO)
11
+endif()
12
+
13
 add_custom_target(doc ALL
14
     COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
15
     DEPENDS
16
-        OpenColorIO
17
-        PyOpenColorIO
18
+        ${DEPLIST}
19
         ${CMAKE_BINARY_DIR}/docs/conf.py
20
         developers/api/OpenColorIO.rst
21
         developers/api/OpenColorTransforms.rst
22
@@ -110,12 +115,11 @@ add_custom_target(doc ALL
23
 add_dependencies(doc Sphinx) 
24
 
25
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
26
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
27
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
28
         PATTERN .* EXCLUDE
29
 )
30
 
31
-find_package(LATEX)
32
-if(PDFLATEX_COMPILER)
33
+if(0)
34
     
35
     add_custom_target(latex
36
         COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
(-)opencolorio/files/patch-docs__CMakeLists.txt (-17 lines)
Lines 1-17 Link Here
1
--- ./docs/CMakeLists.txt.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./docs/CMakeLists.txt	2012-10-08 00:26:42.081351698 +1030
3
@@ -98,11 +98,10 @@
4
 add_dependencies(doc Sphinx) 
5
 
6
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
7
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
8
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
9
         PATTERN .* EXCLUDE
10
 )
11
 
12
-find_package(LATEX)
13
-if(PDFLATEX_COMPILER)
14
+if(0)
15
     
16
     add_custom_target(latex
17
         COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
(-)opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in (-22 lines)
Lines 1-22 Link Here
1
--- export/OpenColorIO/OpenColorABI.h.in.orig	2012-12-12 09:51:23.000000000 +1030
2
+++ export/OpenColorIO/OpenColorABI.h.in	2013-01-29 21:13:34.104857600 +1030
3
@@ -55,6 +55,10 @@
4
 #include <boost/shared_ptr.hpp>
5
 #define OCIO_SHARED_PTR boost::shared_ptr
6
 #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
7
+#elif defined(_LIBCPP_VERSION)
8
+#include <memory>
9
+#define OCIO_SHARED_PTR std::shared_ptr
10
+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
11
 #elif __GNUC__ >= 4
12
 #include <tr1/memory>
13
 #define OCIO_SHARED_PTR std::tr1::shared_ptr
14
@@ -65,7 +65,7 @@
15
 
16
 // If supported, define OCIOEXPORT, OCIOHIDDEN
17
 // (used to choose which symbols to export from OpenColorIO)
18
-#if defined __linux__ || __APPLE__
19
+#if defined __linux__ || __APPLE__ || __FreeBSD__
20
     #if __GNUC__ >= 4
21
         #define OCIOEXPORT __attribute__ ((visibility("default")))
22
         #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
(-)opencolorio/files/patch-share__cmake__OCIOMacros.cmake (-20 lines)
Lines 1-20 Link Here
1
--- ./share/cmake/OCIOMacros.cmake.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./share/cmake/OCIOMacros.cmake	2012-10-08 00:20:27.666350767 +1030
3
@@ -294,7 +294,7 @@
4
 MACRO(ExtractRstCPP INFILE OUTFILE)
5
    add_custom_command(
6
       OUTPUT ${OUTFILE}
7
-      COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
8
+      COMMAND python ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
9
       DEPENDS ${INFILE}
10
       COMMENT "Extracting reStructuredText from ${INFILE} (using old process)"
11
    )
12
@@ -303,7 +303,7 @@
13
 MACRO(ExtractRstSimple INFILE OUTFILE)
14
    add_custom_command(
15
       OUTPUT ${OUTFILE}
16
-      COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
17
+      COMMAND python ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
18
       DEPENDS ${INFILE}
19
       COMMENT "Extracting reStructuredText from ${INFILE}"
20
    )
(-)opencolorio/files/patch-share_cmake_OCIOMacros.cmake (+11 lines)
Line 0 Link Here
1
--- share/cmake/OCIOMacros.cmake.orig	2015-08-29 00:58:36 UTC
2
+++ share/cmake/OCIOMacros.cmake
3
@@ -168,7 +168,7 @@ MACRO(OCIOFindPython)
4
         file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
5
 
6
         FIND_LIBRARY(PYTHON_LIBRARY
7
-            NAMES "python${PYTHON_VERSION}"
8
+            NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
9
             PATHS ${PYTHON_LIBRARY_DIRS}
10
             NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
11
         )
(-)opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py (+29 lines)
Line 0 Link Here
1
--- share/sphinx/ExtractRstFromSourceCPP.py.orig	2015-08-23 23:10:32 UTC
2
+++ share/sphinx/ExtractRstFromSourceCPP.py
3
@@ -146,7 +146,7 @@ class Comment:
4
         
5
         if buffer_lines[0] != '':
6
             buffer_lines.insert(0, '')
7
-        for x in xrange(0, len(buffer_lines)):
8
+        for x in range(0, len(buffer_lines)):
9
             buffer_lines[x] = "   %s" % buffer_lines[x]
10
         buffer_lines.append('')
11
         buffer = '\n'.join(buffer_lines)
12
@@ -181,7 +181,7 @@ def ExtractRst(string, fileh):
13
                     indent += 1
14
             # remove indent
15
             bufa = [buf_lines[0]]
16
-            for x in xrange(1, len(buf_lines)):
17
+            for x in range(1, len(buf_lines)):
18
                 bufa.append(buf_lines[x][indent:])
19
             buf = '\n'.join(bufa) + '\n'
20
             ##
21
@@ -229,7 +229,7 @@ if __name__ == "__main__":
22
             sys.exit(1)
23
         
24
         src = open(sys.argv[1]).read()
25
-        output = file(sys.argv[2], 'w')
26
+        output = open(sys.argv[2], 'w')
27
         ExtractRst(src, output)
28
         output.close()
29
         
(-)opencolorio/files/patch-src__apps__ocioconvert__CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- ./src/apps/ocioconvert/CMakeLists.txt.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./src/apps/ocioconvert/CMakeLists.txt	2012-10-07 21:56:32.462351272 +1030
3
@@ -10,7 +10,7 @@
4
     
5
     add_executable(ocioconvert ${share_src_files} main.cpp)
6
     
7
-    target_link_libraries(ocioconvert ${OIIO_LIBRARIES} OpenColorIO dl)
8
+    target_link_libraries(ocioconvert ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS})
9
     
10
     install(TARGETS ocioconvert DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
11
 endif()
(-)opencolorio/files/patch-src__apps__ociolutimage__CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- ./src/apps/ociolutimage/CMakeLists.txt.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./src/apps/ociolutimage/CMakeLists.txt	2012-10-07 21:56:32.463351075 +1030
3
@@ -10,7 +10,7 @@
4
     
5
     add_executable(ociolutimage ${share_src_files} main.cpp)
6
     
7
-    target_link_libraries(ociolutimage ${OIIO_LIBRARIES} OpenColorIO dl)
8
+    target_link_libraries(ociolutimage ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS})
9
     
10
     install(TARGETS ociolutimage DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
11
 endif()
(-)opencolorio/files/patch-src__core__CMakeLists.txt (-8 lines)
Lines 1-8 Link Here
1
--- ./src/core/CMakeLists.txt.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./src/core/CMakeLists.txt	2012-10-08 00:20:27.667351098 +1030
3
@@ -90,4 +90,4 @@
4
 configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
5
     ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
6
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
7
-    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
8
+    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)
(-)opencolorio/files/patch-src__core__Platform.h (-12 lines)
Lines 1-12 Link Here
1
--- ./src/core/Platform.h.orig	2012-04-18 09:38:16.000000000 +0930
2
+++ ./src/core/Platform.h	2012-10-08 00:20:27.668352332 +1030
3
@@ -85,7 +85,9 @@
4
 
5
 // linux/unix/posix
6
 #include <stdlib.h>
7
+#if !defined(__FreeBSD__)
8
 #include <alloca.h>
9
+#endif
10
 #include <string.h>
11
 #include <pthread.h>
12
 // OS for spinlock
(-)opencolorio/files/patch-src_core__tests_CMakeLists.txt (+12 lines)
Line 0 Link Here
1
--- src/core_tests/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
2
+++ src/core_tests/CMakeLists.txt
3
@@ -7,8 +7,8 @@ add_definitions("-DOCIO_SOURCE_DIR=${CMA
4
 include_directories(
5
     ${CMAKE_SOURCE_DIR}/export/
6
     ${CMAKE_BINARY_DIR}/export/
7
-    ${EXTERNAL_INCLUDE_DIRS}
8
     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
9
+    ${EXTERNAL_INCLUDE_DIRS}
10
     )
11
 
12
 file( GLOB_RECURSE core_test_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp" )
(-)opencolorio/files/patch-src_jniglue_CMakeLists.txt (+13 lines)
Line 0 Link Here
1
--- src/jniglue/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
2
+++ src/jniglue/CMakeLists.txt
3
@@ -1,9 +1,9 @@
4
 
5
 include_directories(
6
-  ${JNI_INCLUDE_DIRS}
7
   ${CMAKE_CURRENT_BINARY_DIR}
8
   ${CMAKE_SOURCE_DIR}/export/
9
   ${CMAKE_BINARY_DIR}/export/
10
+  ${JNI_INCLUDE_DIRS}
11
 )
12
 
13
 set(JNIOCIO_CLASSES
(-)opencolorio/files/patch-src_pyglue_CMakeLists.txt (+24 lines)
Line 0 Link Here
1
--- src/pyglue/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
2
+++ src/pyglue/CMakeLists.txt
3
@@ -31,18 +31,18 @@ add_library(PyOpenColorIO MODULE ${pyglu
4
 
5
 if(OCIO_USE_BOOST_PTR)
6
     include_directories(
7
-        ${PYTHON_INCLUDE}
8
-        ${Boost_INCLUDE_DIR}
9
         ${CMAKE_SOURCE_DIR}/export/
10
         ${CMAKE_BINARY_DIR}/export/
11
         ${CMAKE_CURRENT_BINARY_DIR}
12
+        ${PYTHON_INCLUDE}
13
+        ${Boost_INCLUDE_DIR}
14
     )
15
 else()
16
     include_directories(
17
-        ${PYTHON_INCLUDE}
18
         ${CMAKE_SOURCE_DIR}/export/
19
         ${CMAKE_BINARY_DIR}/export/
20
         ${CMAKE_CURRENT_BINARY_DIR}
21
+        ${PYTHON_INCLUDE}
22
     )
23
 endif()
24
 
(-)opencolorio/pkg-plist (-13 / +16 lines)
Lines 1-14 Link Here
1
include/OpenColorIO/OpenColorTypes.h
2
include/OpenColorIO/OpenColorTransforms.h
3
include/OpenColorIO/OpenColorABI.h
1
include/OpenColorIO/OpenColorABI.h
4
include/OpenColorIO/OpenColorIO.h
2
include/OpenColorIO/OpenColorIO.h
3
include/OpenColorIO/OpenColorTransforms.h
4
include/OpenColorIO/OpenColorTypes.h
5
include/PyOpenColorIO/PyOpenColorIO.h
5
include/PyOpenColorIO/PyOpenColorIO.h
6
%%PYTHON_SITELIBDIR%%/PyOpenColorIO.so
7
lib/libOpenColorIO.so
6
lib/libOpenColorIO.so
8
lib/libOpenColorIO.so.1
7
lib/libOpenColorIO.so.1
9
lib/libOpenColorIO.so.1.0.8
8
lib/libOpenColorIO.so.1.0.9
10
libdata/pkgconfig/OpenColorIO.pc
9
libdata/pkgconfig/OpenColorIO.pc
11
share/ocio/setup_ocio.sh
10
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
11
%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
12
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
13
%%PORTDOCS%%%%DOCSDIR%%/License.html
12
%%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
14
%%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
13
%%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
15
%%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
14
%%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg
16
%%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg
Lines 21-40 Link Here
21
%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
23
%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
22
%%PORTDOCS%%%%DOCSDIR%%/_sources/ChangeLog.txt
24
%%PORTDOCS%%%%DOCSDIR%%/_sources/ChangeLog.txt
23
%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
25
%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
26
%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
27
%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
24
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
28
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
25
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
29
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
26
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
30
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
27
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
31
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
28
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_pipeline.txt
32
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_pipeline.txt
29
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
33
%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
30
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
31
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
34
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
32
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
35
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
33
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.txt
36
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.txt
37
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
34
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonAPI.txt
38
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonAPI.txt
35
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTransforms.txt
39
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTransforms.txt
36
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTypes.txt
40
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTypes.txt
37
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/coding_guidelines.txt
41
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/coding_guidelines.txt
42
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/documentation_guidelines.txt
38
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/getting_started.txt
43
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/getting_started.txt
39
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/index.txt
44
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/index.txt
40
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/internal_architecture.txt
45
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/internal_architecture.txt
Lines 42-52 Link Here
42
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/submitting_changes.txt
47
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/submitting_changes.txt
43
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
48
%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
44
%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
49
%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
45
%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
46
%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
50
%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
47
%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
51
%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
48
%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
49
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
52
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
53
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt
50
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/contexts.txt
54
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/contexts.txt
51
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/index.txt
55
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/index.txt
52
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/looks.txt
56
%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/looks.txt
Lines 77-98 Link Here
77
%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
81
%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
78
%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
82
%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
79
%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
83
%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
80
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
81
%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
82
%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
84
%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
83
%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
85
%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
84
%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
86
%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
85
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
87
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
86
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_pipeline.html
88
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_pipeline.html
87
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
89
%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
88
%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
89
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
90
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
90
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
91
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
91
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
92
%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
93
%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
92
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
94
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
93
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
95
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
94
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
96
%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
95
%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
97
%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
98
%%PORTDOCS%%%%DOCSDIR%%/developers/documentation_guidelines.html
96
%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
99
%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
97
%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
100
%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
98
%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
101
%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
Lines 100-116 Link Here
100
%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
103
%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
101
%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
104
%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
102
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
105
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
103
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
104
%%PORTDOCS%%%%DOCSDIR%%/genindex.html
106
%%PORTDOCS%%%%DOCSDIR%%/genindex.html
105
%%PORTDOCS%%%%DOCSDIR%%/index.html
107
%%PORTDOCS%%%%DOCSDIR%%/index.html
106
%%PORTDOCS%%%%DOCSDIR%%/installation.html
108
%%PORTDOCS%%%%DOCSDIR%%/installation.html
107
%%PORTDOCS%%%%DOCSDIR%%/License.html
108
%%PORTDOCS%%%%DOCSDIR%%/objects.inv
109
%%PORTDOCS%%%%DOCSDIR%%/objects.inv
109
%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
110
%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
110
%%PORTDOCS%%%%DOCSDIR%%/search.html
111
%%PORTDOCS%%%%DOCSDIR%%/search.html
111
%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
112
%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
112
%%PORTDOCS%%%%DOCSDIR%%/userguide/baking_luts.html
113
%%PORTDOCS%%%%DOCSDIR%%/userguide/baking_luts.html
114
%%PORTDOCS%%%%DOCSDIR%%/userguide/config_syntax.html
113
%%PORTDOCS%%%%DOCSDIR%%/userguide/contexts.html
115
%%PORTDOCS%%%%DOCSDIR%%/userguide/contexts.html
114
%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
116
%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
115
%%PORTDOCS%%%%DOCSDIR%%/userguide/looks.html
117
%%PORTDOCS%%%%DOCSDIR%%/userguide/looks.html
116
%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
118
%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
119
share/ocio/setup_ocio.sh
(-)opencolorio/pkg-plist-pyglue (+1 lines)
Line 0 Link Here
1
%%PYTHON_SITELIBDIR%%/PyOpenColorIO.so
(-)opencolorio-tools/Makefile (-4 / +1 lines)
Lines 6-15 Link Here
6
COMMENT=	Tools to work with OpenColorIO profiles
6
COMMENT=	Tools to work with OpenColorIO profiles
7
7
8
MASTERDIR=	${.CURDIR}/../opencolorio
8
MASTERDIR=	${.CURDIR}/../opencolorio
9
OCIO_SLAVE=	tools
9
OPTIONS_EXCLUDE=DOCS
10
OPTIONS_EXCLUDE=DOCS
10
11
11
USE_GL=		glew glut
12
13
EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
14
15
.include "${MASTERDIR}/Makefile"
12
.include "${MASTERDIR}/Makefile"
(-)py-opencolorio/Makefile (+12 lines)
Line 0 Link Here
1
# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
2
# $FreeBSD$
3
4
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
5
6
COMMENT=	OpenColorIO python bindings
7
8
MASTERDIR=	${.CURDIR}/../opencolorio
9
OCIO_SLAVE=	pymodule
10
OPTIONS_EXCLUDE=DOCS
11
12
.include "${MASTERDIR}/Makefile"

Return to bug 202577