Attachment #247025 for bug #275402

Lines 1-4 Link Here

(-)b/graphics/opencolorio-tools/Makefile (-1 / +1 lines)
1	PORTREVISION= 4	1	PORTREVISION= 0
2	PKGNAMESUFFIX= -tools	2	PKGNAMESUFFIX= -tools
3		3
4	COMMENT= Tools to work with OpenColorIO profiles	4	COMMENT= Tools to work with OpenColorIO profiles

Lines 1-11 Link Here

(-)b/graphics/opencolorio/Makefile (-2 / +2 lines)
1	PORTNAME= opencolorio	1	PORTNAME= opencolorio
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.2.1	3	DISTVERSION= 2.3.1
4	# PORTREVISION must be set with ?= so as not to stomp over	4	# PORTREVISION must be set with ?= so as not to stomp over
5	# py-opencolorio's PORTREVISION.	5	# py-opencolorio's PORTREVISION.
6	# Also, just to be on the safe side, when resetting,	6	# Also, just to be on the safe side, when resetting,
7	# best keep PORTREVISION?= 0.	7	# best keep PORTREVISION?= 0.
8	PORTREVISION?= 4	8	PORTREVISION?= 0
9	CATEGORIES= graphics multimedia	9	CATEGORIES= graphics multimedia
10		10
11	MAINTAINER?= FreeBSD@Shaneware.biz	11	MAINTAINER?= FreeBSD@Shaneware.biz

Lines 1-5 Link Here

(-)b/graphics/opencolorio/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1674065371	1	TIMESTAMP = 1702463590
2	SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.2.1_GH0.tar.gz) = 36f27c5887fc4e5c241805c29b8b8e68725aa05520bcaa7c7ec84c0422b8580e	2	SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.3.1_GH0.tar.gz) = 7196e979a0449ce28afd46a78383476f3b8fc1cc1d3a417192be439ede83437b
3	SIZE (AcademySoftwareFoundation-OpenColorIO-v2.2.1_GH0.tar.gz) = 11336775	3	SIZE (AcademySoftwareFoundation-OpenColorIO-v2.3.1_GH0.tar.gz) = 11443167
4	SHA256 (madler-zlib-v1.2.13_GH0.tar.gz) = 1525952a0a567581792613a9723333d7f8cc20b87a81f920fb8bc7e3f2251428
5	SIZE (madler-zlib-v1.2.13_GH0.tar.gz) = 1556687




--- share/cmake/modules/FindExtPackages.cmake.orig	2023-01-06 02:05:59 UTC
+++ share/cmake/modules/FindExtPackages.cmake
@@ -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
-    find_package(Python ${OCIO_PYTHON_VERSION} REQUIRED
+    find_package(Python ${OCIO_PYTHON_VERSION} EXACT
                  COMPONENTS ${_Python_COMPONENTS})
 
     if(OCIO_BUILD_PYTHON)




--- share/cmake/modules/Findyaml-cpp.cmake.orig	2023-01-06 02:05:59 UTC
+++ share/cmake/modules/Findyaml-cpp.cmake
@@ -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()
-
-    if(yaml-cpp_FOUND)
+    # while yaml-cpp.cmake finds yaml-cpp the LIBRARY fails to be set for 0.7.0??
+    if(NOT yaml-cpp_FOUND)
         get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
     else()
 

Lines 1-4 Link Here

(-)b/graphics/py-opencolorio/Makefile (-2 / +1 lines)
1	PORTREVISION= 2	1	PORTREVISION= 0
2	CATEGORIES= graphics multimedia python	2	CATEGORIES= graphics multimedia python
3	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	3	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
4		4
5	-

Return to bug 275402

Removed Link Here

(-)a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake (-20 lines)
1	--- share/cmake/modules/FindExtPackages.cmake.orig 2023-01-06 02:05:59 UTC
2	+++ share/cmake/modules/FindExtPackages.cmake
3	@@ -69,7 +69,7 @@ find_package(Imath 3.0 REQUIRED)
4	# ZLIB 1.2.13 is used since it fixes a critical vulnerability.
5	# See https://nvd.nist.gov/vuln/detail/CVE-2022-37434
6	# See https://github.com/madler/zlib/releases/tag/v1.2.13
7	-set(_ZLIB_FIND_VERSION "1.2.13")
8	+set(_ZLIB_FIND_VERSION "1.2.12")
9	set(_ZLIB_ExternalProject_VERSION ${_ZLIB_FIND_VERSION})
10
11	if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
12	@@ -178,7 +178,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
13	endif()
14
15	# Python
16	- find_package(Python ${OCIO_PYTHON_VERSION} REQUIRED
17	+ find_package(Python ${OCIO_PYTHON_VERSION} EXACT
18	COMPONENTS ${_Python_COMPONENTS})
19
20	if(OCIO_BUILD_PYTHON)

Removed Link Here

(-)a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake (-13 lines)
1	--- share/cmake/modules/Findyaml-cpp.cmake.orig 2023-01-06 02:05:59 UTC
2	+++ share/cmake/modules/Findyaml-cpp.cmake
3	@@ -41,8 +41,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
4	# Search for yaml-cpp-config.cmake
5	find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
6	endif()
7	-
8	- if(yaml-cpp_FOUND)
9	+ # while yaml-cpp.cmake finds yaml-cpp the LIBRARY fails to be set for 0.7.0??
10	+ if(NOT yaml-cpp_FOUND)
11	get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
12	else()
13

Lines 98-103 Link Here

(-)b/graphics/opencolorio/pkg-plist-docs (+2 lines)
98	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_0.rst.txt	98	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_0.rst.txt
99	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_1.rst.txt	99	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_1.rst.txt
100	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_2.rst.txt	100	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_2.rst.txt
		101	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/releases/ocio_2_3.rst.txt
101	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/requirements.txt	102	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/requirements.txt
102	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/toc_redirect.rst.txt	103	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/toc_redirect.rst.txt
103	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/_index.rst.txt	104	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/_index.rst.txt
Lines 208-213 Link Here
208	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_0.html	209	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_0.html
209	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_1.html	210	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_1.html
210	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_2.html	211	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_2.html
		212	%%PORTDOCS%%%%DOCSDIR%%/html/releases/ocio_2_3.html
211	%%PORTDOCS%%%%DOCSDIR%%/html/requirements.html	213	%%PORTDOCS%%%%DOCSDIR%%/html/requirements.html
212	%%PORTDOCS%%%%DOCSDIR%%/html/search.html	214	%%PORTDOCS%%%%DOCSDIR%%/html/search.html
213	%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js	215	%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js