pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/opencolorio

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun 26 16:20:55 UTC 2024

Modified Files:
        pkgsrc/graphics/opencolorio: Makefile PLIST distinfo
        pkgsrc/graphics/opencolorio/patches:
            patch-share_cmake_modules_Findyaml-cpp.cmake
            patch-src_OpenColorIO_CMakeLists.txt
Removed Files:
        pkgsrc/graphics/opencolorio/patches:
            patch-src_OpenColorIO_OCIOZArchive.cpp
            patch-src_apps_ocioarchive_main.cpp

Log Message:
opencolorio: updated to 2.3.2

v2.3.2

This is an ABI-compatible update for the 2.3.x series that includes all fixes since the 2.3.1 release.

In particular, this release fixes two crashes:

Certain older (generally 7-12 year old) CPUs including Intel x86-64 (Sandy Bridge and Ivy Bridge) and Intel Atom (Goldmont/Apollo Lake) microarchitectures that support SSE 4.2 SIMD instructions but 
do not support the initial AVX set and XSAVE, or other CPUs where the OS has disabled AVX and XSAVE support, will crash when trying to evaluate a Lut1D or Lut3D in OCIO libraries compiled with SSE 
enabled (which is the default). More recent CPUs (e.g., those supporting AVX2 or higher) should not be affected.

Users of the Linux Python bindings via PyPI will crash when trying to use OCIO from within another application that has been compiled with the new libstdc++ ABI, per the requirements of the VFX 
Platform for CY2023 and CY2024.

Bug fixes and minor enhancements:

Prevent trying to use AVX instructions on certain CPUs that don't support them
Add manylinux_2_28 Python wheels for compliance with the current VFX Platform libstdc++ ABI
Fix ssse3 detection typo
Fix build break with custom PyString installs by always using system include pystring.h
Fix narrowing conversion error in unit test on riscv64
Enhance the ociochecklut command-line tool to print the output after each step


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/opencolorio/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/opencolorio/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/opencolorio/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake \
    pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_OCIOZArchive.cpp \
    pkgsrc/graphics/opencolorio/patches/patch-src_apps_ocioarchive_main.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/graphics/opencolorio/Makefile
diff -u pkgsrc/graphics/opencolorio/Makefile:1.10 pkgsrc/graphics/opencolorio/Makefile:1.11
--- pkgsrc/graphics/opencolorio/Makefile:1.10   Tue Nov  7 20:29:25 2023
+++ pkgsrc/graphics/opencolorio/Makefile        Wed Jun 26 16:20:55 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2023/11/07 20:29:25 nros Exp $
+# $NetBSD: Makefile,v 1.11 2024/06/26 16:20:55 adam Exp $
 
-DISTNAME=      OpenColorIO-2.2.1
+DISTNAME=      OpenColorIO-2.3.2
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/}
 GITHUB_PROJECT=        OpenColorIO
@@ -13,11 +12,15 @@ HOMEPAGE=   https://opencolorio.org/
 COMMENT=       Color management solution
 LICENSE=       modified-bsd AND mit
 
-USE_TOOLS+=    gmake pkg-config
-USE_LANGUAGES= c c++
-
 USE_CC_FEATURES+=      c99
 USE_CXX_FEATURES+=     c++14
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake pkg-config
+
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src/OpenColorIO
+# For Darwin
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src/OpenColorIO
+TEST_TARGET=   test
 
 CMAKE_CONFIGURE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF
 CMAKE_CONFIGURE_ARGS+= -DOCIO_BUILD_PYGLUE:BOOL=OFF
@@ -32,6 +35,17 @@ PKGCONFIG_OVERRIDE+= src/OpenColorIO/res
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
+.include "../../mk/bsd.prefs.mk"
+# Use native macOS OpenGL.
+.if ${OPSYS} == "Darwin"
+# Tries to download sse2neon.h.
+CMAKE_CONFIGURE_ARGS+= -DOCIO_USE_SSE2NEON=OFF
+.else
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.endif
+
 .include "../../devel/cmake/build.mk"
 
 .include "../../archivers/minizip-ng/buildlink3.mk"
@@ -40,15 +54,12 @@ BUILDLINK_TRANSFORM+=       rm:-Werror
 .include "../../devel/pystring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.13
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../math/imath/buildlink3.mk"
 BUILDLINK_API_DEPENDS.expat+=  expat>=2.4.1
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
 PY_PATCHPLIST= yes
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/opencolorio/PLIST
diff -u pkgsrc/graphics/opencolorio/PLIST:1.4 pkgsrc/graphics/opencolorio/PLIST:1.5
--- pkgsrc/graphics/opencolorio/PLIST:1.4       Sun Oct 15 19:45:33 2023
+++ pkgsrc/graphics/opencolorio/PLIST   Wed Jun 26 16:20:55 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/10/15 19:45:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/06/26 16:20:55 adam Exp $
 include/OpenColorIO/OpenColorABI.h
 include/OpenColorIO/OpenColorAppHelpers.h
 include/OpenColorIO/OpenColorIO.h
@@ -11,9 +11,10 @@ lib/cmake/OpenColorIO/OpenColorIOConfigV
 lib/cmake/OpenColorIO/OpenColorIOTargets-release.cmake
 lib/cmake/OpenColorIO/OpenColorIOTargets.cmake
 lib/libOpenColorIO.so
-lib/libOpenColorIO.so.2.2
 lib/libOpenColorIO.so.${PKGVERSION}
+lib/libOpenColorIO.so.2.3
 lib/libOpenColorIOoglapphelpers.a
 lib/pkgconfig/OpenColorIO.pc
-${PYSITELIB}/PyOpenColorIO.so
+${PYSITELIB}/PyOpenColorIO/PyOpenColorIO.so
+${PYSITELIB}/PyOpenColorIO/__init__.py
 share/ocio/setup_ocio.sh

Index: pkgsrc/graphics/opencolorio/distinfo
diff -u pkgsrc/graphics/opencolorio/distinfo:1.12 pkgsrc/graphics/opencolorio/distinfo:1.13
--- pkgsrc/graphics/opencolorio/distinfo:1.12   Thu Nov  9 15:21:17 2023
+++ pkgsrc/graphics/opencolorio/distinfo        Wed Jun 26 16:20:55 2024
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.12 2023/11/09 15:21:17 nros Exp $
+$NetBSD: distinfo,v 1.13 2024/06/26 16:20:55 adam Exp $
 
-BLAKE2s (OpenColorIO-2.2.1.tar.gz) = 5fd74fcfa9cc588b7252dcc32df273c69a62a49ccd22b3258f6b2a4d3022624a
-SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
-Size (OpenColorIO-2.2.1.tar.gz) = 11336775 bytes
-SHA1 (patch-share_cmake_modules_Findyaml-cpp.cmake) = e0ae8f97d09ef9c762b419a96a0c091333b4a0c9
+BLAKE2s (OpenColorIO-2.3.2.tar.gz) = 72a712974c0be40b803f0096e9dfefd38e39e6dcf3062f399cd0282d1c0d7f41
+SHA512 (OpenColorIO-2.3.2.tar.gz) = 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133
+Size (OpenColorIO-2.3.2.tar.gz) = 11443450 bytes
+SHA1 (patch-share_cmake_modules_Findyaml-cpp.cmake) = d1caac8dc2f0be283b5a32d4e686c9200e8ae53f
 SHA1 (patch-share_cmake_utils_CheckSupportGL.cmake) = f259440166689f7fd8970a61456f111981083733
-SHA1 (patch-src_OpenColorIO_CMakeLists.txt) = 72715406f7cd0e092fcec1808f6682b0ddec8683
-SHA1 (patch-src_OpenColorIO_OCIOZArchive.cpp) = 07f6832350a400d98f273bacf16a82df1c1031f9
-SHA1 (patch-src_apps_ocioarchive_main.cpp) = 227dc6f8bee4415db6eb54deef8551aee8b2bb36
+SHA1 (patch-src_OpenColorIO_CMakeLists.txt) = 1d54608673f2cd04fd7382f7f513e4abb41ab65b
 SHA1 (patch-src_apputils_argparse.cpp) = 2c0948e891ad340a36f728070ac57b55691cece0
 SHA1 (patch-src_utils_NumberUtils.h) = 35cd321b9759144a16e8a376f83a119a6f7e4719

Index: pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake
diff -u pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake:1.1 pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake:1.2
--- pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake:1.1        Sun Oct 15 19:45:33 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-share_cmake_modules_Findyaml-cpp.cmake    Wed Jun 26 16:20:55 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-share_cmake_modules_Findyaml-cpp.cmake,v 1.1 2023/10/15 19:45:33 ryoon Exp $
+$NetBSD: patch-share_cmake_modules_Findyaml-cpp.cmake,v 1.2 2024/06/26 16:20:55 adam Exp $
 
-* Fix yaml-cpp-0.8.8 detection.
+Fix yaml-cpp-0.8.8 detection.
 
---- share/cmake/modules/Findyaml-cpp.cmake.orig        2023-01-06 02:05:59.000000000 +0000
+--- share/cmake/modules/Findyaml-cpp.cmake.orig        2024-01-30 07:11:35.000000000 +0000
 +++ share/cmake/modules/Findyaml-cpp.cmake
-@@ -39,7 +39,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
+@@ -49,7 +49,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
  
+     # Search for yaml-cpp-config.cmake
      if(NOT DEFINED yaml-cpp_ROOT)
-         # Search for yaml-cpp-config.cmake
--        find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
-+        find_package(yaml-cpp::yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
+-        find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
++        find_package(yaml-cpp::yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
      endif()
  
      if(yaml-cpp_FOUND)
Index: pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt
diff -u pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt:1.1 pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt:1.2
--- pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt:1.1        Thu Nov  9 14:54:03 2023
+++ pkgsrc/graphics/opencolorio/patches/patch-src_OpenColorIO_CMakeLists.txt    Wed Jun 26 16:20:55 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_OpenColorIO_CMakeLists.txt,v 1.1 2023/11/09 14:54:03 nros Exp $
+$NetBSD: patch-src_OpenColorIO_CMakeLists.txt,v 1.2 2024/06/26 16:20:55 adam Exp $
 
 Solaris linker does not support --exclude-libraries
 
---- src/OpenColorIO/CMakeLists.txt.orig        2023-01-06 02:05:59.000000000 +0000
+--- src/OpenColorIO/CMakeLists.txt.orig        2024-01-30 07:11:35.000000000 +0000
 +++ src/OpenColorIO/CMakeLists.txt
-@@ -361,7 +361,7 @@ set_target_properties(OpenColorIO PROPER
-     PUBLIC_HEADER "${INSTALL_HEADERS}"
- )
+@@ -373,7 +373,7 @@ endif()
+ 
+ set(CUSTOM_LINK_FLAGS ${PLATFORM_LINK_OPTIONS})
  
 -if(UNIX AND NOT APPLE)
 +if(UNIX AND NOT APPLE AND NOT CMAKE_HOST_SOLARIS)
Home | Main Index | Thread Index | Old Index