Attachment #190675 for bug #225941

Lines 1-3 Link Here

(-)graphics/opencolorio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1474003473	1	TIMESTAMP = 1517541978
2	SHA256 (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = cc932053f9b91c0f8549fe20bbb5d9ebc4c03e0638feac04b16a45dd73c37bc6	2	SHA256 (imageworks-OpenColorIO-v1.1.0_GH0.tar.gz) = 228589879e1f11e455a555304007748a8904057088319ebbf172d9384b93c079
3	SIZE (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = 13744688	3	SIZE (imageworks-OpenColorIO-v1.1.0_GH0.tar.gz) = 13826812

Lines 1-10 Link Here

(-)graphics/opencolorio/files/extra-patch-CMakeLists.txt (-10 lines)
1	--- ./CMakeLists.txt.orig 2012-10-07 21:57:35.533351894 +1030
2	+++ ./CMakeLists.txt
3	@@ -375,7 +375,6 @@
4	configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
5	${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
6
7	-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
8
9	###############################################################################
10	### CPACK ###

Lines 1-8 Link Here

(-)graphics/opencolorio/files/extra-patch-src_core_CMakeLists.txt (-8 lines)
1	--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
2	+++ src/core/CMakeLists.txt
3	@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
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/)




--- src/core/CMakeLists.txt.orig	2014-09-12 04:38:18.000000000 +0930
+++ src/core/CMakeLists.txt
@@ -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/)




--- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ ./CMakeLists.txt
@@ -596,7 +599,7 @@ if(TARGET OpenColorIO_STATIC)
         set(OCIO_STATIC_COMPILE_DEFINITIONS )
     endif()
 endif()
-install(EXPORT OpenColorIO DESTINATION cmake)
+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
 file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
     "
     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
     "
 )
-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)

Line 0 Link Here

(-)graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt (+8 lines)
	1	--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
	2	+++ src/core/CMakeLists.txt
	3	@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
	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/)




--- CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ CMakeLists.txt
@@ -3,6 +3,10 @@ set(OCIO_VERSION_MAJOR 1)
 set(OCIO_VERSION_MINOR 1)
 set(OCIO_VERSION_PATCH 0)
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
 if(NOT DEFINED CMAKE_FIRST_RUN)
@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
         ## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
         ## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
         ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
-        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
-        add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
+        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
         list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
     else()
         find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
@@ -384,7 +387,7 @@ else()
     set(OCIO_INLINES_HIDDEN OFF)
 endif()
 
-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
 
 set(EXTERNAL_LINK_FLAGS "")
 set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)




--- 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()
         




--- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+++ ./CMakeLists.txt
@@ -457,7 +460,7 @@ endif()
 ###############################################################################
 ### APPS ###
 
-if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
+if(OCIO_BUILD_APPS)
 
     # Try to find OpenImageIO (OIIO) and OpenGL stuff
     OCIOFindOpenImageIO()
@@ -531,7 +534,7 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
 
 ###############################################################################
 ### CPACK ###
@@ -596,7 +595,7 @@ if(TARGET OpenColorIO_STATIC)
         set(OCIO_STATIC_COMPILE_DEFINITIONS )
     endif()
 endif()
-install(EXPORT OpenColorIO DESTINATION cmake)
+#install(EXPORT OpenColorIO DESTINATION cmake)
 file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
     "
     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
     "
 )
-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
+#install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)




--- src/core/CMakeLists.txt.orig	2018-02-05 14:07:04 UTC
+++ src/core/CMakeLists.txt
@@ -105,15 +105,3 @@ macro(target_link_OCIO target)
         set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
     endif()
 endmacro()
-
-
-# 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/)




# $FreeBSD$

PORTNAME=	opencolorio
PORTVERSION=	1.1.0
DISTVERSIONPREFIX=	v
CATEGORIES=	graphics multimedia

MAINTAINER?=	FreeBSD@Shaneware.biz

USE_GITHUB=	yes
GH_ACCOUNT=	imageworks
GH_PROJECT=	OpenColorIO
GH_TAGNAME=	67e455b97e

OPTIONS_DEFINE=	DOCS



LDFLAGS+=	-L${LOCALBASE}/lib
USES=		alias cmake:outsource pkgconfig shebangfix
CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML VERBOSE
CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
		-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_ON+=	OCIO_USE_SSE
.else
CMAKE_OFF+=	OCIO_USE_SSE
.endif

BROKEN_aarch64=		Does not compile: error: use of undeclared identifier __builtin_ia32_emms

LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
		libOpenImageIO.so:graphics/openimageio \
		libOpenColorIO.so:graphics/opencolorio
CMAKE_ON+=	OCIO_BUILD_APPS USE_EXTERNAL_LCMS
CMAKE_OFF+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
LDFLAGS+=	-lOpenColorIO
USE_GL=		gl glu glut glew
USE_XORG=	xi xmu
PLIST=		${PKGDIR}/pkg-plist-tools
EXTRA_PATCHES=	${PATCHDIR}/tools
		${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
		libOpenColorIO.so:graphics/opencolorio
USES+=		python
USE_PYTHON=	flavors
LDFLAGS+=	-lOpenColorIO
CMAKE_ON+=	OCIO_BUILD_PYGLUE OCIO_PYGLUE_LINK
CMAKE_OFF+=	OCIO_BUILD_APPS OCIO_BUILD_SHARED
CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
PLIST=		${PKGDIR}/pkg-plist-pyglue
.else # master port
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}

		libyaml-cpp03.so:devel/yaml-cpp03
USES+=		python:2,build
USE_LDCONFIG=	yes
CMAKE_ON+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
CMAKE_OFF+=	OCIO_BUILD_APPS
CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
		-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

# 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=	${PATCHDIR}/libs
.endif

post-patch:

Return to bug 225941

Lines 1-16 Link Here

(-)graphics/opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (-16 lines)
1	--- src/core/CMakeLists.txt.orig 2014-09-12 04:38:18.000000000 +0930
2	+++ src/core/CMakeLists.txt
3	@@ -81,13 +81,3 @@ if(OCIO_BUILD_STATIC)
4	install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
5	endif()
6
7	-# public interface
8	-install(FILES ${core_export_headers}
9	- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
10	-
11	-# pkg-config
12	-message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
13	-configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
14	- ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
15	-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
16	- DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)

Line 0 Link Here

(-)graphics/opencolorio/files/libs/patch-CMakeLists.txt (+17 lines)
	1	--- ./CMakeLists.txt.orig 2018-01-05 12:08:27 UTC
	2	+++ ./CMakeLists.txt
	3	@@ -596,7 +599,7 @@ if(TARGET OpenColorIO_STATIC)
	4	set(OCIO_STATIC_COMPILE_DEFINITIONS )
	5	endif()
	6	endif()
	7	-install(EXPORT OpenColorIO DESTINATION cmake)
	8	+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
	9	file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
	10	"
	11	get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
	12	@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
	13	message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
	14	"
	15	)
	16	-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
	17	+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)

Line 0 Link Here

(-)graphics/opencolorio/files/patch-CMakeLists.txt (+32 lines)
	1	--- CMakeLists.txt.orig 2018-01-05 12:08:27 UTC
	2	+++ CMakeLists.txt
	3	@@ -3,6 +3,10 @@ set(OCIO_VERSION_MAJOR 1)
	4	set(OCIO_VERSION_MINOR 1)
	5	set(OCIO_VERSION_PATCH 0)
	6
	7	+set(CMAKE_CXX_STANDARD 11)
	8	+set(CMAKE_CXX_STANDARD_REQUIRED ON)
	9	+set(CMAKE_CXX_EXTENSIONS OFF)
	10	+
	11	cmake_minimum_required(VERSION 2.8)
	12	set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
	13	if(NOT DEFINED CMAKE_FIRST_RUN)
	14	@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
	15	## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
	16	## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
	17	## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
	18	- set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
	19	- add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
	20	+ set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
	21	list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
	22	else()
	23	find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
	24	@@ -384,7 +387,7 @@ else()
	25	set(OCIO_INLINES_HIDDEN OFF)
	26	endif()
	27
	28	-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
	29	+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
	30
	31	set(EXTERNAL_LINK_FLAGS "")
	32	set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)

Lines 1-29 Link Here

(-)graphics/opencolorio/files/patch-share_sphinx_ExtractRstFromSourceCPP.py (-29 lines)
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

Line 0 Link Here

(-)graphics/opencolorio/files/tools/patch-CMakeLists.txt (+35 lines)
	1	--- ./CMakeLists.txt.orig 2018-01-05 12:08:27 UTC
	2	+++ ./CMakeLists.txt
	3	@@ -457,7 +460,7 @@ endif()
	4	###############################################################################
	5	### APPS ###
	6
	7	-if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
	8	+if(OCIO_BUILD_APPS)
	9
	10	# Try to find OpenImageIO (OIIO) and OpenGL stuff
	11	OCIOFindOpenImageIO()
	12	@@ -531,7 +534,7 @@ endif()
	13	configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
	14	${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
	15
	16	-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
	17	+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
	18
	19	###############################################################################
	20	### CPACK ###
	21	@@ -596,7 +595,7 @@ if(TARGET OpenColorIO_STATIC)
	22	set(OCIO_STATIC_COMPILE_DEFINITIONS )
	23	endif()
	24	endif()
	25	-install(EXPORT OpenColorIO DESTINATION cmake)
	26	+#install(EXPORT OpenColorIO DESTINATION cmake)
	27	file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
	28	"
	29	get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
	30	@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
	31	message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
	32	"
	33	)
	34	-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
	35	+#install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)

Line 0 Link Here

(-)graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt (+18 lines)
	1	--- src/core/CMakeLists.txt.orig 2018-02-05 14:07:04 UTC
	2	+++ src/core/CMakeLists.txt
	3	@@ -105,15 +105,3 @@ macro(target_link_OCIO target)
	4	set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
	5	endif()
	6	endmacro()
	7	-
	8	-
	9	-# public interface
	10	-install(FILES ${core_export_headers}
	11	- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
	12	-
	13	-# pkg-config
	14	-message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
	15	-configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
	16	- ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
	17	-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
	18	- DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)

Lines 2-9 Link Here

(-)graphics/opencolorio/Makefile (-24 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opencolorio	4	PORTNAME= opencolorio
5	PORTVERSION= 1.0.9	5	PORTVERSION= 1.1.0
6	PORTREVISION?= 4	6	DISTVERSIONPREFIX= v
7	CATEGORIES= graphics multimedia	7	CATEGORIES= graphics multimedia
8		8
9	MAINTAINER?= FreeBSD@Shaneware.biz	9	MAINTAINER?= FreeBSD@Shaneware.biz
Lines 14-20 Link Here
14	USE_GITHUB= yes	14	USE_GITHUB= yes
15	GH_ACCOUNT= imageworks	15	GH_ACCOUNT= imageworks
16	GH_PROJECT= OpenColorIO	16	GH_PROJECT= OpenColorIO
17	GH_TAGNAME= 67e455b97e
18		17
19	OPTIONS_DEFINE= DOCS	18	OPTIONS_DEFINE= DOCS
20		19
Lines 22-40 Link Here
22		21
23	LDFLAGS+= -L${LOCALBASE}/lib	22	LDFLAGS+= -L${LOCALBASE}/lib
24	USES= alias cmake:outsource pkgconfig shebangfix	23	USES= alias cmake:outsource pkgconfig shebangfix
25	CMAKE_ARGS= -DOCIO_BUILD_JNIGLUE:BOOL=OFF \	24	CMAKE_ON= USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML VERBOSE
26	-DOCIO_BUILD_NUKE:BOOL=OFF \	25	CMAKE_OFF= OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
27	-DOCIO_BUILD_STATIC:BOOL=OFF \
28	-DUSE_EXTERNAL_TINYXML:BOOL=ON \
29	-DUSE_EXTERNAL_YAML:BOOL=ON
30	SHEBANG_FILES= share/sphinx/ExtractRstFromSourceCPP.py \	26	SHEBANG_FILES= share/sphinx/ExtractRstFromSourceCPP.py \
31	share/sphinx/ExtractRstFromSourceSimple.py \	27	share/sphinx/ExtractRstFromSourceSimple.py \
32	src/pyglue/createPyDocH.py	28	src/pyglue/createPyDocH.py
33		29
34	.if ${MACHINE_CPU:Msse2}	30	.if ${MACHINE_CPU:Msse2}
35	CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON	31	CMAKE_ON+= OCIO_USE_SSE
36	.else	32	.else
37	CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF	33	CMAKE_OFF+= OCIO_USE_SSE
38	.endif	34	.endif
39		35
40	BROKEN_aarch64= Does not compile: error: use of undeclared identifier __builtin_ia32_emms	36	BROKEN_aarch64= Does not compile: error: use of undeclared identifier __builtin_ia32_emms
Lines 50-72 Link Here
50	LIB_DEPENDS= liblcms2.so:graphics/lcms2 \	46	LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
51	libOpenImageIO.so:graphics/openimageio \	47	libOpenImageIO.so:graphics/openimageio \
52	libOpenColorIO.so:graphics/opencolorio	48	libOpenColorIO.so:graphics/opencolorio
53	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=ON \	49	CMAKE_ON+= OCIO_BUILD_APPS USE_EXTERNAL_LCMS
54	-DOCIO_BUILD_SHARED:BOOL=OFF \	50	CMAKE_OFF+= OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
55	-DOCIO_BUILD_PYGLUE:BOOL=OFF	51	LDFLAGS+= -lOpenColorIO
56	USE_GL= gl glu glut glew	52	USE_GL= gl glu glut glew
57	USE_XORG= xi xmu	53	USE_XORG= xi xmu
58	PLIST= ${PKGDIR}/pkg-plist-tools	54	PLIST= ${PKGDIR}/pkg-plist-tools
59	EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt \	55	EXTRA_PATCHES= ${PATCHDIR}/tools
60	${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
61	.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule	56	.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
62	LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \	57	LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
63	libOpenColorIO.so:graphics/opencolorio	58	libOpenColorIO.so:graphics/opencolorio
64	USES+= python	59	USES+= python
65	USE_PYTHON= flavors	60	USE_PYTHON= flavors
66	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \	61	LDFLAGS+= -lOpenColorIO
67	-DOCIO_BUILD_SHARED:BOOL=OFF \	62	CMAKE_ON+= OCIO_BUILD_PYGLUE OCIO_PYGLUE_LINK
68	-DOCIO_BUILD_PYGLUE:BOOL=ON \	63	CMAKE_OFF+= OCIO_BUILD_APPS OCIO_BUILD_SHARED
69	-DPYTHON:STRING=${PYTHON_CMD}	64	CMAKE_ARGS+= -DPYTHON:FILEPATH=${PYTHON_CMD}
70	PLIST= ${PKGDIR}/pkg-plist-pyglue	65	PLIST= ${PKGDIR}/pkg-plist-pyglue
71	.else # master port	66	.else # master port
72	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}	67	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
Lines 74-83 Link Here
74	libyaml-cpp03.so:devel/yaml-cpp03	69	libyaml-cpp03.so:devel/yaml-cpp03
75	USES+= python:2,build	70	USES+= python:2,build
76	USE_LDCONFIG= yes	71	USE_LDCONFIG= yes
77	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \	72	CMAKE_ON+= OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
78	-DOCIO_BUILD_SHARED:BOOL=ON \	73	CMAKE_OFF+= OCIO_BUILD_APPS
79	-DOCIO_BUILD_PYGLUE:BOOL=ON \	74	CMAKE_ARGS+= -DPYTHON:FILEPATH=${PYTHON_CMD}
80	-DPYTHON:FILEPATH=${PYTHON_CMD}
81	# we enable pyglue in master port. This makes the python module	75	# we enable pyglue in master port. This makes the python module
82	# available when generating docs, we leave the python header in place	76	# available when generating docs, we leave the python header in place
83	# but only install the python module with the py-opencolorio port	77	# but only install the python module with the py-opencolorio port
Lines 85-91 Link Here
85	# doc building fails using python3 - but the py-opencolorio port can still	79	# doc building fails using python3 - but the py-opencolorio port can still
86	# be used to build a python 3 module	80	# be used to build a python 3 module
87	PLIST= ${PKGDIR}/pkg-plist	81	PLIST= ${PKGDIR}/pkg-plist
88	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_core_CMakeLists.txt	82	EXTRA_PATCHES= ${PATCHDIR}/libs
89	.endif	83	.endif
90		84
91	post-patch:	85	post-patch:

Lines 5-12 Link Here

(-)graphics/opencolorio/pkg-plist (-3 / +8 lines)
5	include/PyOpenColorIO/PyOpenColorIO.h	5	include/PyOpenColorIO/PyOpenColorIO.h
6	lib/libOpenColorIO.so	6	lib/libOpenColorIO.so
7	lib/libOpenColorIO.so.1	7	lib/libOpenColorIO.so.1
8	lib/libOpenColorIO.so.1.0.9	8	lib/libOpenColorIO.so.1.1.0
9	libdata/pkgconfig/OpenColorIO.pc	9	libdata/pkgconfig/OpenColorIO.pc
		10	share/cmake/Modules/OpenColorIOConfig.cmake
		11	share/cmake/Modules/OpenColorIO-%%CMAKE_BUILD_TYPE%%.cmake
		12	share/cmake/Modules/OpenColorIO.cmake
10	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html	13	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
11	%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html	14	%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
12	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html	15	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
Lines 25-35 Link Here
25	%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt	28	%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
26	%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt	29	%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
27	%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt	30	%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
		31	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/aces_1.0.3.txt
28	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt	32	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
29	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt	33	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
30	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt	34	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
31	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt	35	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
32	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_pipeline.txt
33	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt	36	%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
34	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt	37	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
35	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt	38	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
Lines 48-53 Link Here
48	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt	51	%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
49	%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt	52	%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
50	%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt	53	%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
		54	%%PORTDOCS%%%%DOCSDIR%%/_sources/introduction.txt
51	%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt	55	%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
52	%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt	56	%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
53	%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt	57	%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt
Lines 81-91 Link Here
81	%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png	85	%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
82	%%PORTDOCS%%%%DOCSDIR%%/_static/up.png	86	%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
83	%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js	87	%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
		88	%%PORTDOCS%%%%DOCSDIR%%/configurations/aces_1.0.3.html
84	%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html	89	%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
85	%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html	90	%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
86	%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html	91	%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
87	%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html	92	%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
88	%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_pipeline.html
89	%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html	93	%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
90	%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html	94	%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
91	%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html	95	%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
Lines 106-111 Link Here
106	%%PORTDOCS%%%%DOCSDIR%%/genindex.html	110	%%PORTDOCS%%%%DOCSDIR%%/genindex.html
107	%%PORTDOCS%%%%DOCSDIR%%/index.html	111	%%PORTDOCS%%%%DOCSDIR%%/index.html
108	%%PORTDOCS%%%%DOCSDIR%%/installation.html	112	%%PORTDOCS%%%%DOCSDIR%%/installation.html
		113	%%PORTDOCS%%%%DOCSDIR%%/introduction.html
109	%%PORTDOCS%%%%DOCSDIR%%/objects.inv	114	%%PORTDOCS%%%%DOCSDIR%%/objects.inv
110	%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html	115	%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
111	%%PORTDOCS%%%%DOCSDIR%%/search.html	116	%%PORTDOCS%%%%DOCSDIR%%/search.html