Update graphics/opencolorio to 2.1.1
This update is required for the upcoming blender-3.0.1 and
has a new dependency for devel/pystring which has already
been sent to the ports mailing list.
Changelog:https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.1.1
Build & Run tested with openimageio and blender.
Tests have been enabled and all of them pass.
Adding myself as MAINTAINER since I intend to keep it updated.
regards,
Dimitri
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 2 Nov 2021 00:01:15 -0000 1.16
+++ Makefile 2 Mar 2022 02:45:34 -0000
@@ -5,8 +5,7 @@ COMMENT = color management library
EPOCH = 0
GH_ACCOUNT = AcademySoftwareFoundation
GH_PROJECT = OpenColorIO
-GH_TAGNAME = v1.1.1
-REVISION = 1
+GH_TAGNAME = v2.1.1
PKGNAME = ${DISTNAME:L}
SHARED_LIBS += OpenColorIO 1.1 # 1.1.1
@@ -15,12 +14,13 @@ CATEGORIES = graphics
HOMEPAGE = http://opencolorio.org/index.html
-MAINTAINER = Pascal Stumpf <pascal@stumpf.co>
+MAINTAINER = Pascal Stumpf <pascal@stumpf.co> \
+ Dimitri Karamazov <deserter666@danwin1210.me>
# several BSD-like
PERMIT_PACKAGE = Yes
-WANTLIB += m pthread ${COMPILER_LIBCXX} tinyxml yaml-cpp
+WANTLIB += ${COMPILER_LIBCXX} Imath-3_1 expat m pystring yaml-cpp
COMPILER = base-clang ports-gcc
@@ -28,25 +28,16 @@ MODULES = devel/cmake \
lang/python
BUILD_DEPENDS = devel/boost
-LIB_DEPENDS = textproc/tinyxml \
- devel/yaml-cpp
+LIB_DEPENDS = devel/pystring \
+ devel/yaml-cpp \
+ math/imath
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 \
-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-DCMAKE_MODULE_LINKER_FLAGS="-L${LOCALBASE}/lib"
-
-NO_TEST = Yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/cmake/OpenColorIO
- mv ${PREFIX}/cmake/*.cmake ${PREFIX}/OpenColorIO*.cmake \
- ${PREFIX}/lib/cmake/OpenColorIO
- rm -rf ${PREFIX}/cmake
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 1 Jan 2021 22:48:55 -0000 1.4
+++ distinfo 2 Mar 2022 02:45:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (OpenColorIO-1.1.1.tar.gz) = ybW53vkH4dr7KeNzNrcC//IsxjBtRFoTsWIbinVMFMg=
-SIZE (OpenColorIO-1.1.1.tar.gz) = 13828483
+SHA256 (OpenColorIO-2.1.1.tar.gz) = FuvD4PIfctvpD+YEN+uGT01N6cJV744hL4N4JPybjZw=
+SIZE (OpenColorIO-2.1.1.tar.gz) = 11013141
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Aug 2021 18:13:23 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.4 2021/08/11 18:13:23 kmos Exp $
-
-Fix macro redefined error
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -218,8 +218,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 +383,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)
Index: patches/patch-src_core_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_core_CMakeLists_txt
diff -N patches/patch-src_core_CMakeLists_txt
--- patches/patch-src_core_CMakeLists_txt 11 Aug 2021 18:13:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_core_CMakeLists_txt,v 1.1 2021/08/11 18:13:23 kmos Exp $
-
-Strip -Werror to fix sparc64 build
-
-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_Config_cpp
===================================================================
RCS file: patches/patch-src_core_Config_cpp
diff -N patches/patch-src_core_Config_cpp
--- patches/patch-src_core_Config_cpp 1 Jan 2021 22:53:20 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_core_Config_cpp,v 1.4 2021/01/01 22:53:20 sthen Exp $
-
-Upstream fix - Squashing Adsk contrib/operator rhs
-
---- src/core/Config.cpp.orig Thu Dec 3 22:17:51 2020
-+++ src/core/Config.cpp Thu Dec 3 22:18:10 2020
-@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER
- sanitytext_ = rhs.sanitytext_;
-
- cacheids_ = rhs.cacheids_;
-- cacheidnocontext_ = cacheidnocontext_;
-+ cacheidnocontext_ = rhs.cacheidnocontext_;
- }
- return *this;
- }
Index: patches/patch-src_core_OCIOYaml_cpp
===================================================================
RCS file: patches/patch-src_core_OCIOYaml_cpp
diff -N patches/patch-src_core_OCIOYaml_cpp
--- patches/patch-src_core_OCIOYaml_cpp 1 Jan 2021 22:48:56 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-$OpenBSD: patch-src_core_OCIOYaml_cpp,v 1.4 2021/01/01 22:48:56 sthen Exp $
-
-Fix the build with newer yaml-cpp.
-
-Index: src/core/OCIOYaml.cpp
---- src/core/OCIOYaml.cpp.orig Thu Dec 24 17:16:21 2020
-+++ src/core/OCIOYaml.cpp Thu Dec 24 17:16:43 2020
-@@ -30,53 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
-
- #include <OpenColorIO/OpenColorIO.h>
-
--#ifndef WIN32
--
--// fwd declare yaml-cpp visibility
--#pragma GCC visibility push(hidden)
--namespace YAML {
-- class Exception;
-- class BadDereference;
-- class RepresentationException;
-- class EmitterException;
-- class ParserException;
-- class InvalidScalar;
-- class KeyNotFound;
-- template <typename T> class TypedKeyNotFound;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
--}
--#pragma GCC visibility pop
--
--
No comments:
Post a Comment