git: 4d5c66e73859 - main - graphics/opencolorio: update to 2.2.1 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Thu, 27 Apr 2023 19:12:56 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d5c66e73859ad565236768a9a63695e1ecf575e

commit 4d5c66e73859ad565236768a9a63695e1ecf575e
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2023-04-27 18:32:32 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2023-04-27 19:05:16 +0000

    graphics/opencolorio:   update to 2.2.1 release (+)
    
    Changelog:      https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.2.1
    
    Approved by:    maintainer (implicit)
---
 graphics/opencolorio-tools/Makefile                  |  2 +-
 graphics/opencolorio/Makefile                        | 11 ++++++++---
 graphics/opencolorio/distinfo                        |  8 +++++---
 graphics/opencolorio/files/patch-CMakeLists.txt      | 11 -----------
 .../patch-share_cmake_modules_FindExtPackages.cmake  | 13 +++++++++++--
 .../patch-share_cmake_modules_Findyaml-cpp.cmake     |  4 ++--
 graphics/opencolorio/pkg-plist-docs                  | 20 +++++++++++++-------
 graphics/py-opencolorio/Makefile                     |  2 +-
 8 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/graphics/opencolorio-tools/Makefile b/graphics/opencolorio-tools/Makefile
index 6db12e7be1ea..7da3bd09b21a 100644
--- a/graphics/opencolorio-tools/Makefile
+++ b/graphics/opencolorio-tools/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-tools
 
 COMMENT=	Tools to work with OpenColorIO profiles
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 282601d3bcb8..80bd5c4ef544 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	opencolorio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.3
+DISTVERSION=	2.2.1
 # PORTREVISION must be set with ?= so as not to stomp over
 # py-opencolorio's PORTREVISION.
 # Also, just to be on the safe side, when resetting,
 # best keep PORTREVISION?=	0.
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -18,7 +18,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libImath.so:math/Imath \
 		libpystring.so:devel/pystring \
-		libyaml-cpp.so:devel/yaml-cpp
+		libyaml-cpp.so:devel/yaml-cpp \
+		libminizip-ng.so:archivers/minizip-ng \
+		libzstd.so:archivers/zstd
 USES=		alias cmake compiler:c++14-lang localbase:ldflags \
 		pkgconfig
 
@@ -26,10 +28,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenColorIO
 
+#GH_TUPLE+=	madler:zlib:v1.2.13:zlib/ext/dist/zlib
+
 CMAKE_OFF=	OCIO_BUILD_JAVA OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE \
 		OCIO_BUILD_TESTS OCIO_BUILD_GPU_TESTS
 
 OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
diff --git a/graphics/opencolorio/distinfo b/graphics/opencolorio/distinfo
index 42ac51a52549..245710e0b494 100644
--- a/graphics/opencolorio/distinfo
+++ b/graphics/opencolorio/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1674865156
-SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.1.3_GH0.tar.gz) = c826a4088a6358fcf39628c852a460c145a4191a5e16ef96fe6a0aaed065d36a
-SIZE (AcademySoftwareFoundation-OpenColorIO-v2.1.3_GH0.tar.gz) = 11024701
+TIMESTAMP = 1674065371
+SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.2.1_GH0.tar.gz) = 36f27c5887fc4e5c241805c29b8b8e68725aa05520bcaa7c7ec84c0422b8580e
+SIZE (AcademySoftwareFoundation-OpenColorIO-v2.2.1_GH0.tar.gz) = 11336775
+SHA256 (madler-zlib-v1.2.13_GH0.tar.gz) = 1525952a0a567581792613a9723333d7f8cc20b87a81f920fb8bc7e3f2251428
+SIZE (madler-zlib-v1.2.13_GH0.tar.gz) = 1556687
diff --git a/graphics/opencolorio/files/patch-CMakeLists.txt b/graphics/opencolorio/files/patch-CMakeLists.txt
deleted file mode 100644
index ef5879c82295..000000000000
--- a/graphics/opencolorio/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2021-12-01 02:34:49 UTC
-+++ CMakeLists.txt
-@@ -132,8 +132,7 @@ option(OCIO_BUILD_FROZEN_DOCS "Specify whether to buil
- option(OCIO_BUILD_DOCS "Specify whether to build documentation" ${OCIO_BUILD_FROZEN_DOCS})
- 
- option(OCIO_BUILD_PYTHON "Specify whether to build python bindings" ON)
--set (OCIO_PYTHON_VERSION "" CACHE STRING
--     "Preferred Python version (if any) in case multiple are available")
-+option(OCIO_PYTHON_VERSION "Preferred Python version (if any) in case multiple are available" 3.8)
- 
- option(OCIO_BUILD_JAVA "Specify whether to build java bindings" OFF)
diff --git a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake b/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake
index 2ce58be89de1..34da61f4e78b 100644
--- a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake
+++ b/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake
@@ -1,6 +1,15 @@
---- share/cmake/modules/FindExtPackages.cmake.orig	2021-08-31 10:54:04 UTC
+--- share/cmake/modules/FindExtPackages.cmake.orig	2023-01-06 02:05:59 UTC
 +++ share/cmake/modules/FindExtPackages.cmake
-@@ -107,7 +107,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
+@@ -69,7 +69,7 @@ find_package(Imath 3.0 REQUIRED)
+ # ZLIB 1.2.13 is used since it fixes a critical vulnerability.
+ # See https://nvd.nist.gov/vuln/detail/CVE-2022-37434
+ # See https://github.com/madler/zlib/releases/tag/v1.2.13
+-set(_ZLIB_FIND_VERSION "1.2.13")
++set(_ZLIB_FIND_VERSION "1.2.12")
+ set(_ZLIB_ExternalProject_VERSION ${_ZLIB_FIND_VERSION})
+ 
+ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+@@ -178,7 +178,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
      endif()
  
      # Python
diff --git a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake b/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake
index 35c8f565d7f7..9fd4f7adf4a1 100644
--- a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake
+++ b/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake
@@ -1,6 +1,6 @@
---- share/cmake/modules/Findyaml-cpp.cmake.orig	2021-12-02 22:09:04 UTC
+--- share/cmake/modules/Findyaml-cpp.cmake.orig	2023-01-06 02:05:59 UTC
 +++ share/cmake/modules/Findyaml-cpp.cmake
-@@ -32,8 +32,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+@@ -41,8 +41,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
          # Search for yaml-cpp-config.cmake
          find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
      endif()
diff --git a/graphics/opencolorio/pkg-plist-docs b/graphics/opencolorio/pkg-plist-docs
index 79339162d229..015eb19a1700 100644
--- a/graphics/opencolorio/pkg-plist-docs
+++ b/graphics/opencolorio/pkg-plist-docs
@@ -2,7 +2,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/CMakeLists.html
 %%PORTDOCS%%%%DOCSDIR%%/html/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.html
-%%PORTDOCS%%%%DOCSDIR%%/html/V2_DOC_README.html
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/gn10_to_linear_light.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/gnf_to_linear_light.jpeg
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/lg10_to_linear_light.jpeg
@@ -17,7 +16,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/CMakeLists.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/INSTALL.md.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/README.md.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/_sources/V2_DOC_README.md.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/_index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/apphelpers.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/baker.rst.txt
@@ -54,6 +52,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/publications/publications.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/_index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/aces_1.0.3.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/aces_cg.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/aces_studio.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/nuke_default.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/ocio_v2_demo.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/spi_anim.rst.txt
@@ -94,21 +94,23 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_contributors.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_devs.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/installation.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_0.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_1.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_2.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/requirements.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/toc_redirect.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/_index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/baking_luts.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/contributing.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/_sources/upgrading_v2/_index.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/_sources/upgrading_v2/how_to.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/_sphinx_javascript_frameworks_compat.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/OpenColorIO_withText.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/documentation_options.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.6.0.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.6.0.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/language_data.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/ocio_b.svg
@@ -158,6 +160,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/concepts/publications/publications.html
 %%PORTDOCS%%%%DOCSDIR%%/html/configurations/_index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/configurations/aces_1.0.3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/aces_cg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/aces_studio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/configurations/nuke_default.html
 %%PORTDOCS%%%%DOCSDIR%%/html/configurations/ocio_v2_demo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/configurations/spi_anim.html
@@ -200,6 +204,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_contributors.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_devs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/quick_start/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/releases/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/requirements.html
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
@@ -207,5 +215,3 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorials/_index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorials/baking_luts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorials/contributing.html
-%%PORTDOCS%%%%DOCSDIR%%/html/upgrading_v2/_index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/upgrading_v2/how_to.html
diff --git a/graphics/py-opencolorio/Makefile b/graphics/py-opencolorio/Makefile
index 619ca7dd0d55..255684dfd78d 100644
--- a/graphics/py-opencolorio/Makefile
+++ b/graphics/py-opencolorio/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}