Attachment 188881 Details for Bug 224380 – maintainer update for graphics/opencolorio

[patch] maintainer update for graphics/opencolorio

opencolorio.patch (text/plain), 8.84 KB, created by Shane on 2017-12-16 14:14:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2017-12-16 14:14:25 UTC

Size: 8.84 KB

patch

obsolete

>diff -Nru opencolorio.orig/distinfo opencolorio/distinfo
>--- opencolorio.orig/distinfo	2017-12-17 00:27:21.760094000 +1030
>+++ opencolorio/distinfo	2016-09-22 20:41:31.023874000 +0930
>@@ -1,2 +1,3 @@
>-SHA256 (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = ad530a5ed89305d8daaaa93db1a2c5359d82b32ed55c8661cdcda2976173ab94
>-SIZE (imageworks-OpenColorIO-1.0.9-a557a85454_GH0.tar.gz) = 13741068
>+TIMESTAMP = 1474003473
>+SHA256 (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = cc932053f9b91c0f8549fe20bbb5d9ebc4c03e0638feac04b16a45dd73c37bc6
>+SIZE (imageworks-OpenColorIO-1.0.9-67e455b97e_GH0.tar.gz) = 13744688
>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	2017-12-17 00:27:21.759560000 +1030
>+++ opencolorio/files/extra-patch-src_core_CMakeLists.txt	2016-09-22 20:41:55.976228000 +0930
>@@ -1,15 +1,5 @@
> --- 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)
>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	2017-12-17 00:27:21.759665000 +1030
>+++ opencolorio/files/extra-tools-patch-src_core_CMakeLists.txt	2016-09-22 20:41:54.272187000 +0930
>@@ -1,15 +1,5 @@
> --- 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()
>diff -Nru opencolorio.orig/files/patch-docs_CMakeLists.txt opencolorio/files/patch-docs_CMakeLists.txt
>--- opencolorio.orig/files/patch-docs_CMakeLists.txt	2017-12-17 00:27:21.759400000 +1030
>+++ opencolorio/files/patch-docs_CMakeLists.txt	2016-09-22 20:41:51.859565000 +0930
>@@ -1,24 +1,5 @@
> --- 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) 
>  
>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	2017-12-17 00:27:21.759508000 +1030
>+++ opencolorio/files/patch-src_core__tests_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>@@ -1,12 +0,0 @@
>---- 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	2017-12-17 00:27:21.759727000 +1030
>+++ opencolorio/files/patch-src_jniglue_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>@@ -1,13 +0,0 @@
>---- 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	2017-12-17 00:27:21.759836000 +1030
>+++ opencolorio/files/patch-src_pyglue_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>@@ -1,24 +0,0 @@
>---- 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/Makefile opencolorio/Makefile
>--- opencolorio.orig/Makefile	2017-12-17 00:27:21.760044000 +1030
>+++ opencolorio/Makefile	2017-12-17 00:07:57.084147000 +1030
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opencolorio
> PORTVERSION=	1.0.9
>-PORTREVISION?=	3
>+PORTREVISION?=	4
> CATEGORIES=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
>@@ -14,10 +14,12 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	imageworks
> GH_PROJECT=	OpenColorIO
>-GH_TAGNAME=	a557a85454
>+GH_TAGNAME=	67e455b97e
> 
> OPTIONS_DEFINE=	DOCS
> 
>+DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
>+
> LDFLAGS+=	-L${LOCALBASE}/lib
> USES=		alias cmake:outsource pkgconfig shebangfix
> CMAKE_ARGS=	-DOCIO_BUILD_JNIGLUE:BOOL=OFF \
>@@ -29,11 +31,11 @@
> 		share/sphinx/ExtractRstFromSourceSimple.py \
> 		src/pyglue/createPyDocH.py
> 
>-#.if ${MACHINE_CPU:Msse2}
>-#CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
>-#.else
>-#CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=OFF
>-#.endif
>+.if ${MACHINE_CPU:Msse2}
>+CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=ON
>+.else
>+CMAKE_ARGS+=	-DOCIO_USE_SSE:BOOL=OFF
>+.endif
> 
> BROKEN_aarch64=		Does not compile: error: use of undeclared identifier __builtin_ia32_emms
> BROKEN_armv6=		Does not compile: error: use of undeclared identifier __builtin_ia32_emms
>@@ -45,18 +47,22 @@
> .include <bsd.port.options.mk>
> 
> .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
>-LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
>+LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
>+		libOpenImageIO.so:graphics/openimageio \
> 		libOpenColorIO.so:graphics/opencolorio
> CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=ON \
> 		-DOCIO_BUILD_SHARED:BOOL=OFF \
> 		-DOCIO_BUILD_PYGLUE:BOOL=OFF
>-USE_GL=		glew glut
>+USE_GL=		gl glu glut glew
>+USE_XORG=	xi xmu
> 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:graphics/openimageio
>+LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
>+		libOpenColorIO.so:graphics/opencolorio
> USES+=		python
>+USE_PYTHON=	flavors
> CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
> 		-DOCIO_BUILD_SHARED:BOOL=OFF \
> 		-DOCIO_BUILD_PYGLUE:BOOL=ON \
>@@ -82,12 +88,6 @@
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_core_CMakeLists.txt
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-CMAKE_ARGS+=	-DOCIO_BUILD_DOCS:BOOL=ON
>-.else
>-CMAKE_ARGS+=	-DOCIO_BUILD_DOCS:BOOL=OFF
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
> 		${WRKSRC}/CMakeLists.txt
>diff -Nru opencolorio.orig/pkg-plist-tools opencolorio/pkg-plist-tools
>--- opencolorio.orig/pkg-plist-tools	2017-12-17 00:27:21.759988000 +1030
>+++ opencolorio/pkg-plist-tools	2017-12-14 17:48:55.613561000 +1030
>@@ -3,8 +3,3 @@
> bin/ocioconvert
> bin/ociodisplay
> bin/ociolutimage
>-@comment include/OpenColorIO/OpenColorABI.h
>-@comment include/OpenColorIO/OpenColorIO.h
>-@comment include/OpenColorIO/OpenColorTransforms.h
>-@comment include/OpenColorIO/OpenColorTypes.h
>-@comment libdata/pkgconfig/OpenColorIO.pc

Actions: View | Diff

Attachments on bug 224380: 188881