Re: git: 3e51c20bc069 - main - graphics/{,py-}opencolorio{,-tools}: Udpate to 2.3.2
Date: Thu, 30 May 2024 19:17:40 UTC
30.05.2024 08:06, Daniel Engberg пишет: > On 2024-05-29T22:27:14.000+02:00, Vladimir Druzenko <vvd@FreeBSD.org> > wrote: > > > > The branch main has been updated by vvd: > > > > > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3e51c20bc069008c296e62e3efb6642d143ac255 > <https://cgit.FreeBSD.org/ports/commit/?id=3e51c20bc069008c296e62e3efb6642d143ac255> > > > > > > commit 3e51c20bc069008c296e62e3efb6642d143ac255 > > > Author: Alastair Hogge <agh@riseup.net <mailto:agh@riseup.net>> > > > AuthorDate: 2024-05-29 20:12:12 +0000 > > > Commit: Vladimir Druzenko <vvd@FreeBSD.org <mailto:vvd@FreeBSD.org>> > > > CommitDate: 2024-05-29 20:26:12 +0000 > > > > > > graphics/{,py-}opencolorio{,-tools}: Udpate to 2.3.2 > > > > > > Changelogs: > > > https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.0 > <https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.0> > > > https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.1 > <https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.1> > > > https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.2 > <https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.2> > > > > > > PR: 275402 > > > Tested by: fluffy, lbartoletti, vvd > > > Approved by: Shane <FreeBSD@ShaneWare.Biz > <mailto:FreeBSD@ShaneWare.Biz>> (maintaner) > > > --- > > > graphics/opencolorio-tools/Makefile | 2 +- > > > graphics/opencolorio/Makefile | 4 ++-- > > > graphics/opencolorio/distinfo | 8 +++----- > > > .../patch-share_cmake_modules_FindExtPackages.cmake | 20 > -------------------- > > > .../patch-share_cmake_modules_Findyaml-cpp.cmake | 13 ------------- > > > graphics/opencolorio/pkg-plist-docs | 2 ++ > > > graphics/py-opencolorio/Makefile | 2 +- > > > 7 files changed, 9 insertions(+), 42 deletions(-) > > > > > > diff --git a/graphics/opencolorio-tools/Makefile > b/graphics/opencolorio-tools/Makefile > > > index b8f0eb0819ae..7da3bd09b21a 100644 > > > --- a/graphics/opencolorio-tools/Makefile > > > +++ b/graphics/opencolorio-tools/Makefile > > > @@ -1,4 +1,4 @@ > > > -PORTREVISION= 5 > > > +PORTREVISION= 0 > > > PKGNAMESUFFIX= -tools > > > > > > COMMENT= Tools to work with OpenColorIO profiles > > > diff --git a/graphics/opencolorio/Makefile > b/graphics/opencolorio/Makefile > > > index 0055118d3e76..e482865f5340 100644 > > > --- a/graphics/opencolorio/Makefile > > > +++ b/graphics/opencolorio/Makefile > > > @@ -1,11 +1,11 @@ > > > PORTNAME= opencolorio > > > DISTVERSIONPREFIX= v > > > -DISTVERSION= 2.2.1 > > > +DISTVERSION= 2.3.2 > > > # 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?= 4 > > > +PORTREVISION?= 0 > > > CATEGORIES= graphics multimedia > > > > > > MAINTAINER?= FreeBSD@Shaneware.biz <mailto:FreeBSD@Shaneware.biz> > > > diff --git a/graphics/opencolorio/distinfo > b/graphics/opencolorio/distinfo > > > index 245710e0b494..59366dcb24d3 100644 > > > --- a/graphics/opencolorio/distinfo > > > +++ b/graphics/opencolorio/distinfo > > > @@ -1,5 +1,3 @@ > > > -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 > > > +TIMESTAMP = 1714594738 > > > +SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.3.2_GH0.tar.gz) > = 6bbf4e7fa4ea2f743a238cb22aff44890425771a2f57f62cece1574e46ceec2f > > > +SIZE (AcademySoftwareFoundation-OpenColorIO-v2.3.2_GH0.tar.gz) = > 11443450 > > > diff --git > a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake > b/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake > > > deleted file mode 100644 > > > index 34da61f4e78b..000000000000 > > > --- > a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake > > > +++ /dev/null > > > @@ -1,20 +0,0 @@ > > > ---- 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 > <https://nvd.nist.gov/vuln/detail/CVE-2022-37434> > > > - # See https://github.com/madler/zlib/releases/tag/v1.2.13 > <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) > > > diff --git > a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake > b/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake > > > deleted file mode 100644 > > > index 9fd4f7adf4a1..000000000000 > > > --- > a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake > > > +++ /dev/null > > > @@ -1,13 +0,0 @@ > > > ---- 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() > > > - > > > diff --git a/graphics/opencolorio/pkg-plist-docs > b/graphics/opencolorio/pkg-plist-docs > > > index 015eb19a1700..2d37fe959639 100644 > > > --- a/graphics/opencolorio/pkg-plist-docs > > > +++ b/graphics/opencolorio/pkg-plist-docs > > > @@ -98,6 +98,7 @@ > > > %%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/releases/ocio_2_3.rst.txt > > > %%PORTDOCS%%%%DOCSDIR%%/html/_sources/requirements.txt > > > %%PORTDOCS%%%%DOCSDIR%%/html/_sources/toc_redirect.rst.txt > > > %%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/_index.rst.txt > > > @@ -208,6 +209,7 @@ > > > %%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/releases/ocio_2_3.html > > > %%PORTDOCS%%%%DOCSDIR%%/html/requirements.html > > > %%PORTDOCS%%%%DOCSDIR%%/html/search.html > > > %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js > > > diff --git a/graphics/py-opencolorio/Makefile > b/graphics/py-opencolorio/Makefile > > > index d07b0df72f9f..255684dfd78d 100644 > > > --- a/graphics/py-opencolorio/Makefile > > > +++ b/graphics/py-opencolorio/Makefile > > > @@ -1,4 +1,4 @@ > > > -PORTREVISION= 2 > > > +PORTREVISION= 0 > > > CATEGORIES= graphics multimedia python > > > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > > > > Hi, > > graphics/opencolorio now fails to build on 14.0 i386 > > ... > /wrkdirs/usr/ports/graphics/opencolorio/work/OpenColorIO-2.3.2/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp:339:18: error: always_inline function '_mm_loadu_ps' requires target feature 'sse', but would be inlined into function 'LoadRenderParams' that is compiled without support for 'sse' > slope = _mm_loadu_ps(renderParams.getSlope()); > > Best regards, > Daniel Hi! Fixed in: https://cgit.freebsd.org/ports/commit/?id=cf58ecc3a65aaf905c0b07af1544ddb19b5af10b Thanks. -- Best regards, Vladimir Druzenko