Hi Pascal, Hi ports@,
last week I worked on boost 1.68.0. It's a long depends path again.
Long story short. Our yaml-cpp is outdated and use non existing boost
parts. New yaml-cpp will break our old opencolorio.
Anyway, please find below an update diff to the latest stable version.
I don't know which version is hidden behind 20140911.
All consumers looks fine on amd64. I see just new symbols in
OpenColorIO, so I only raised minor.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 26 Jul 2017 22:45:24 -0000 1.8
+++ Makefile 7 Sep 2018 10:49:49 -0000
@@ -2,16 +2,17 @@
COMMENT = color management library
-V = 20140911
-DISTNAME = OpenColorIO-$V
-PKGNAME = opencolorio-$V
-REVISION = 1
+V = 1.1.0
+GH_ACCOUNT = imageworks
+GH_PROJECT = OpenColorIO
+GH_TAGNAME = v${V}
+DISTNAME = opencolorio-$V
-SHARED_LIBS += OpenColorIO 1.0 # 1.0
+SHARED_LIBS += OpenColorIO 1.1 # 1.0
CATEGORIES = graphics
-HOMEPAGE = http://opencolorio.org/index.html
+HOMEPAGE = http://opencolorio.org
MAINTAINER = Pascal Stumpf <[email protected]>
@@ -20,27 +21,22 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += m pthread ${COMPILER_LIBCXX} tinyxml yaml-cpp
-MASTER_SITES = http://deftly.net/
-
MODULES = devel/cmake \
lang/python
LIB_DEPENDS = textproc/tinyxml \
devel/yaml-cpp
CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}" \
- -DUSE_EXTERNAL_TINYXML=ON \
- -DUSE_EXTERNAL_YAML=ON \
- -DOCIO_USE_SSE=OFF \
- -DOCIO_BUILD_STATIC=OFF \
-DOCIO_BUILD_APPS=OFF \
+ -DOCIO_BUILD_JNIGLUE:BOOL=OFF \
+ -DOCIO_BUILD_NUKE:BOOL=OFF \
+ -DOCIO_BUILD_STATIC=OFF \
+ -DOCIO_BUILD_TRUELIGHT:BOOL=OFF \
+ -DOCIO_USE_SSE=OFF \
+ -DUSE_EXTERNAL_TINYXML:BOOL=ON \
+ -DUSE_EXTERNAL_YAML:BOOL=ON \
-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-DCMAKE_MODULE_LINKER_FLAGS="-L${LOCALBASE}/lib"
-
-NO_TEST = Yes
-
-WRKDIST = ${WRKDIR}/OpenColorIO-master
-
-CFLAGS = -pthread
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 21 Nov 2014 17:25:49 -0000 1.3
+++ distinfo 7 Sep 2018 10:49:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (OpenColorIO-20140911.tar.gz) =
d1Y6L8peE+SuqhBv/lA5Km70hjRlyszFOuVFmNzlnpQ=
-SIZE (OpenColorIO-20140911.tar.gz) = 13742525
+SHA256 (opencolorio-1.1.0.tar.gz) =
IoWJh54fEeRVpVUwQAd0iokEBXCIMZ678XLZOEuTwHk=
+SIZE (opencolorio-1.1.0.tar.gz) = 13826812
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 7 Sep 2018 10:49:49 -0000
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+Use GNUInstallDirs and fix install location for cmake files
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+
+ enable_language(CXX)
+
+@@ -531,7 +532,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 ${CMAKE_INSTALL_DATADIR}/ocio/)
+
+
###############################################################################
+ ### CPACK ###
+@@ -596,7 +597,7 @@ if(TARGET OpenColorIO_STATIC)
+ set(OCIO_STATIC_COMPILE_DEFINITIONS )
+ endif()
+ endif()
+-install(EXPORT OpenColorIO DESTINATION cmake)
++install(EXPORT OpenColorIO DESTINATION
${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
+ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
+ "
+ get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\"
PATH)
+@@ -608,7 +609,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmak
+
+ ## targets libraries + associated definitions
+ if(NOT TARGET OpenColorIO)
+- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to
imported target
++
include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\")
## thanks to imported target
+ if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
+ message(STATUS \"shared target OpenColorIO : see
OpenColorIO_LIBRARY\")
+ set(OpenColorIO_LIBRARY OpenColorIO)
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmak
+ message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+ "
+ )
+-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION
${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
Index: patches/patch-docs_CMakeLists_txt
===================================================================
RCS file: patches/patch-docs_CMakeLists_txt
diff -N patches/patch-docs_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_CMakeLists_txt 7 Sep 2018 10:49:49 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Index: docs/CMakeLists.txt
+--- docs/CMakeLists.txt.orig
++++ docs/CMakeLists.txt
+@@ -138,7 +138,7 @@ 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_DOCDIR}/html
+ PATTERN .* EXCLUDE
+ )
+
+@@ -166,6 +166,6 @@ if(PDFLATEX_COMPILER)
+ add_dependencies(pdf latex)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++ DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ endif()
Index: patches/patch-export_OpenColorIO_OpenColorABI_h_in
===================================================================
RCS file: patches/patch-export_OpenColorIO_OpenColorABI_h_in
diff -N patches/patch-export_OpenColorIO_OpenColorABI_h_in
--- patches/patch-export_OpenColorIO_OpenColorABI_h_in 21 Nov 2014 17:25:49
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-export_OpenColorIO_OpenColorABI_h_in,v 1.2 2014/11/21 17:25:49
pascal Exp $
---- export/OpenColorIO/OpenColorABI.h.in.orig Thu Sep 11 21:08:18 2014
-+++ export/OpenColorIO/OpenColorABI.h.in Fri Nov 21 13:29:20 2014
-@@ -69,7 +69,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
-
- // If supported, define OCIOEXPORT, OCIOHIDDEN
- // (used to choose which symbols to export from OpenColorIO)
--#if defined __linux__ || __APPLE__ || __FreeBSD__
-+#if defined __linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__
- #if __GNUC__ >= 4
- #define OCIOEXPORT __attribute__ ((visibility("default")))
- #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
Index: patches/patch-export_pkgconfig_OpenColorIO_pc_in
===================================================================
RCS file: patches/patch-export_pkgconfig_OpenColorIO_pc_in
diff -N patches/patch-export_pkgconfig_OpenColorIO_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-export_pkgconfig_OpenColorIO_pc_in 7 Sep 2018 10:49:49
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: export/pkgconfig/OpenColorIO.pc.in
+--- export/pkgconfig/OpenColorIO.pc.in.orig
++++ export/pkgconfig/OpenColorIO.pc.in
+@@ -1,7 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib@LIB_SUFFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: OpenColorIO
+ Description: A color management framework for visual effects and animation
Index: patches/patch-src_core_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_core_CMakeLists_txt
diff -N patches/patch-src_core_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_CMakeLists_txt 7 Sep 2018 10:49:49 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Avoid 'TIXML_USE_STL' macro redefined [-Werror,-Wmacro-redefined]
+
+Index: src/core/CMakeLists.txt
+--- src/core/CMakeLists.txt.orig
++++ src/core/CMakeLists.txt
+@@ -24,7 +24,7 @@ if(WIN32)
+ set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+ endif()
+ else()
+- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
++ set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}")
+ endif()
+
+ # SHARED
Index: patches/patch-src_core_Platform_h
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/patches/patch-src_core_Platform_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_core_Platform_h
--- patches/patch-src_core_Platform_h 25 Mar 2014 10:33:33 -0000 1.1.1.1
+++ patches/patch-src_core_Platform_h 7 Sep 2018 10:49:49 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-src_core_Platform_h,v 1.1.1.1 2014/03/25 10:33:33 pascal Exp $
---- src/core/Platform.h.orig Wed Oct 9 00:59:34 2013
-+++ src/core/Platform.h Mon Mar 24 22:58:05 2014
+Index: src/core/Platform.h
+--- src/core/Platform.h.orig
++++ src/core/Platform.h
@@ -85,7 +85,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+ // assume linux/unix/posix
- // linux/unix/posix
#include <stdlib.h>
-#if !defined(__FreeBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
Index: patches/patch-src_pyglue_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_pyglue_CMakeLists_txt
diff -N patches/patch-src_pyglue_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pyglue_CMakeLists_txt 7 Sep 2018 10:49:49 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Avoid 'TIXML_USE_STL' macro redefined [-Werror,-Wmacro-redefined]
+
+Index: src/pyglue/CMakeLists.txt
+--- src/pyglue/CMakeLists.txt.orig
++++ src/pyglue/CMakeLists.txt
+@@ -23,7 +23,7 @@ endif()
+ # Process all warnings as errors
+ # Unfortunately Windows still has a warning
+ if(UNIX)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+
+ find_package(PythonLibs)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 25 Mar 2014 10:33:33 -0000 1.1.1.1
+++ pkg/PLIST 7 Sep 2018 10:49:49 -0000
@@ -6,6 +6,11 @@ include/OpenColorIO/OpenColorTransforms.
include/OpenColorIO/OpenColorTypes.h
include/PyOpenColorIO/
include/PyOpenColorIO/PyOpenColorIO.h
+lib/cmake/
+lib/cmake/OpenColorIO/
+lib/cmake/OpenColorIO/OpenColorIO${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/OpenColorIO/OpenColorIO.cmake
+lib/cmake/OpenColorIO/OpenColorIOConfig.cmake
@lib lib/libOpenColorIO.so.${LIBOpenColorIO_VERSION}
lib/pkgconfig/OpenColorIO.pc
lib/python${MODPY_VERSION}/site-packages/PyOpenColorIO.so
