Attachment #188881 for bug #224380

View | Details | Raw Unified | Return to bug 224380
Collapse All | Expand All

Lines 1-2 Link Here

(-)opencolorio/distinfo (-2 / +3 lines)
1	SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94	1	TIMESTAMP = 1474003473
2	SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068	2	SHA256 (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = cc932053f9b91c0f8549fe20bbb5d9ebc4c03e0638feac04b16a45dd73c37bc6
		3	SIZE (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = 13744688




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




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




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




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




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




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

Lines 3-9 Link Here

(-)opencolorio/Makefile (-16 / +16 lines)
3		3
4	PORTNAME= opencolorio	4	PORTNAME= opencolorio
5	PORTVERSION= 1.0.9	5	PORTVERSION= 1.0.9
6	PORTREVISION?= 3	6	PORTREVISION?= 4
7	CATEGORIES= graphics multimedia	7	CATEGORIES= graphics multimedia
8		8
9	MAINTAINER?= FreeBSD@Shaneware.biz	9	MAINTAINER?= FreeBSD@Shaneware.biz
Lines 14-23 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= a557a85454	17	GH_TAGNAME= 67e455b97e
18		18
19	OPTIONS_DEFINE= DOCS	19	OPTIONS_DEFINE= DOCS
20		20
		21	DOCS_CMAKE_BOOL= OCIO_BUILD_DOCS
		22
21	LDFLAGS+= -L${LOCALBASE}/lib	23	LDFLAGS+= -L${LOCALBASE}/lib
22	USES= alias cmake:outsource pkgconfig shebangfix	24	USES= alias cmake:outsource pkgconfig shebangfix
23	CMAKE_ARGS= -DOCIO_BUILD_JNIGLUE:BOOL=OFF \	25	CMAKE_ARGS= -DOCIO_BUILD_JNIGLUE:BOOL=OFF \
Lines 29-39 Link Here
29	share/sphinx/ExtractRstFromSourceSimple.py \	31	share/sphinx/ExtractRstFromSourceSimple.py \
30	src/pyglue/createPyDocH.py	32	src/pyglue/createPyDocH.py
31		33
32	#.if ${MACHINE_CPU:Msse2}	34	.if ${MACHINE_CPU:Msse2}
33	#CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON	35	CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=ON
34	#.else	36	.else
35	#CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF	37	CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
36	#.endif	38	.endif
37		39
38	BROKEN_aarch64= Does not compile: error: use of undeclared identifier __builtin_ia32_emms	40	BROKEN_aarch64= Does not compile: error: use of undeclared identifier __builtin_ia32_emms
39	BROKEN_armv6= Does not compile: error: use of undeclared identifier __builtin_ia32_emms	41	BROKEN_armv6= Does not compile: error: use of undeclared identifier __builtin_ia32_emms
Lines 45-62 Link Here
45	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
46		48
47	.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools	49	.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
48	LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \	50	LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
		51	libOpenImageIO.so:graphics/openimageio \
49	libOpenColorIO.so:graphics/opencolorio	52	libOpenColorIO.so:graphics/opencolorio
50	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=ON \	53	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=ON \
51	-DOCIO_BUILD_SHARED:BOOL=OFF \	54	-DOCIO_BUILD_SHARED:BOOL=OFF \
52	-DOCIO_BUILD_PYGLUE:BOOL=OFF	55	-DOCIO_BUILD_PYGLUE:BOOL=OFF
53	USE_GL= glew glut	56	USE_GL= gl glu glut glew
		57	USE_XORG= xi xmu
54	PLIST= ${PKGDIR}/pkg-plist-tools	58	PLIST= ${PKGDIR}/pkg-plist-tools
55	EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt \	59	EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt \
56	${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt	60	${FILESDIR}/extra-tools-patch-src_core_CMakeLists.txt
57	.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule	61	.elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
58	LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio	62	LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
		63	libOpenColorIO.so:graphics/opencolorio
59	USES+= python	64	USES+= python
		65	USE_PYTHON= flavors
60	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \	66	CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \
61	-DOCIO_BUILD_SHARED:BOOL=OFF \	67	-DOCIO_BUILD_SHARED:BOOL=OFF \
62	-DOCIO_BUILD_PYGLUE:BOOL=ON \	68	-DOCIO_BUILD_PYGLUE:BOOL=ON \
Lines 82-93 Link Here
82	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_core_CMakeLists.txt	88	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_core_CMakeLists.txt
83	.endif	89	.endif
84		90
85	.if ${PORT_OPTIONS:MDOCS}
86	CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=ON
87	.else
88	CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF
89	.endif
90
91	post-patch:	91	post-patch:
92	@${REINPLACE_CMD} -e '/pkg_check_modules/ s\|yaml-cpp\|&03\|' \	92	@${REINPLACE_CMD} -e '/pkg_check_modules/ s\|yaml-cpp\|&03\|' \
93	${WRKSRC}/CMakeLists.txt	93	${WRKSRC}/CMakeLists.txt

Lines 3-10 Link Here

(-)opencolorio/pkg-plist-tools (-5 lines)
3	bin/ocioconvert	3	bin/ocioconvert
4	bin/ociodisplay	4	bin/ociodisplay
5	bin/ociolutimage	5	bin/ociolutimage
6	@comment include/OpenColorIO/OpenColorABI.h
7	@comment include/OpenColorIO/OpenColorIO.h
8	@comment include/OpenColorIO/OpenColorTransforms.h
9	@comment include/OpenColorIO/OpenColorTypes.h
10	@comment libdata/pkgconfig/OpenColorIO.pc

Return to bug 224380

Lines 1-15 Link Here

(-)opencolorio/files/extra-patch-src_core_CMakeLists.txt (-10 lines)
1	--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC	1	--- src/core/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
2	+++ src/core/CMakeLists.txt	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	3	@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
14	configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in	4	configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
15	${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)	5	${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)

Lines 1-15 Link Here

(-)opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt (-10 lines)
1	--- src/core/CMakeLists.txt.orig 2014-09-12 04:38:18.000000000 +0930	1	--- src/core/CMakeLists.txt.orig 2014-09-12 04:38:18.000000000 +0930
2	+++ src/core/CMakeLists.txt	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)	3	@@ -81,13 +81,3 @@ if(OCIO_BUILD_STATIC)
14	install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)	4	install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
15	endif()	5	endif()

Lines 1-24 Link Here

(-)opencolorio/files/patch-docs_CMakeLists.txt (-19 lines)
1	--- docs/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC	1	--- docs/CMakeLists.txt.orig 2014-09-11 19:08:18 UTC
2	+++ docs/CMakeLists.txt	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	3	@@ -110,12 +115,11 @@ add_custom_target(doc ALL
23	add_dependencies(doc Sphinx)	4	add_dependencies(doc Sphinx)
24		5

Lines 1-12 Link Here

(-)opencolorio/files/patch-src_core__tests_CMakeLists.txt (-12 lines)
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" )

Lines 1-13 Link Here

(-)opencolorio/files/patch-src_jniglue_CMakeLists.txt (-13 lines)
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

Lines 1-24 Link Here

(-)opencolorio/files/patch-src_pyglue_CMakeLists.txt (-24 lines)
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