CVS commit: pkgsrc/graphics/openimageio

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

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

Modified Files:
        pkgsrc/graphics/openimageio: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/graphics/openimageio/patches: patch-src_cmake_compiler.cmake

Log Message:
openimageio: updated to 2.5.12.0

OpenImageIO v2.5.12.0

exr: Add IOProxy support for EXR multipart output
pnm: Improvements to pnm plugin: support for uint16 and 32-float, "pnm:bigendian" and "pnm:pfmflip" controls for output.
ImageBuf: Improve behavior of IB::nsubimages and other related fixes
simd.h: Fix longstanding problem with 16-wide bitcast for 8-wide HW
strutil.h: Add Strutil::eval_as_bool
tests: Add new heif test output
tests: Fix windows quoting for test
build: More warning elimination for clang18
build: Add appropriate compiler defines and flags for SIMD with MSVC
build: Gcc-14 support, testing, CI
docs: Fix stray references to the old repo home


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/openimageio/PLIST
cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/openimageio/buildlink3.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake

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

Modified files:

Index: pkgsrc/graphics/openimageio/Makefile
diff -u pkgsrc/graphics/openimageio/Makefile:1.104 pkgsrc/graphics/openimageio/Makefile:1.105
--- pkgsrc/graphics/openimageio/Makefile:1.104  Sat Apr  6 09:32:58 2024
+++ pkgsrc/graphics/openimageio/Makefile        Wed Jun 26 16:26:24 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2024/04/06 09:32:58 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2024/06/26 16:26:24 adam Exp $
 
-DISTNAME=      OpenImageIO-2.5.4.0
+DISTNAME=      OpenImageIO-2.5.12.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   6
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/}
 GITHUB_PROJECT=        OpenImageIO
@@ -15,32 +14,32 @@ LICENSE=    modified-bsd
 
 UNLIMIT_RESOURCES=     datasize virtualsize
 
-USE_TOOLS+=            pkg-config
-USE_LANGUAGES=         c c++
-TEST_TARGET=           test
-
-CMAKE_ARGS+=           -DSTOP_ON_WARNING=OFF # Disable -Werror
-CMAKE_ARGS+=           -DBUILD_MISSING_ROBINMAP=OFF
-CMAKE_ARGS+=           -DUSE_EXTERNAL_PUGIXML=ON
-CMAKE_ARGS+=           -DUSE_PYTHON:BOOL=OFF
-CMAKE_ARGS+=           -DROBINMAP_INCLUDE_DIR=${BUILDLINK_PREFIX.robin-map}/include
-CMAKE_ARGS+=           -DOpenJpeg_ROOT=${BUILDLINK_PREFIX.openjpeg}
-CMAKE_ARGS+=           -DOpenEXR_ROOT=${BUILDLINK_PREFIX.openexr}
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config
+TEST_TARGET=   test
+
+CMAKE_ARGS+=   -DSTOP_ON_WARNING=OFF # Disable -Werror
+CMAKE_ARGS+=   -DBUILD_MISSING_ROBINMAP=OFF
+CMAKE_ARGS+=   -DUSE_EXTERNAL_PUGIXML=ON
+CMAKE_ARGS+=   -DUSE_PYTHON=OFF
+CMAKE_ARGS+=   -DROBINMAP_INCLUDE_DIR=${BUILDLINK_PREFIX.robin-map}/include
+CMAKE_ARGS+=   -DOpenJpeg_ROOT=${BUILDLINK_PREFIX.openjpeg}
+CMAKE_ARGS+=   -DOpenEXR_ROOT=${BUILDLINK_PREFIX.openexr}
 
 # none of these are available in pkgsrc yet
-CMAKE_ARGS+=           -DUSE_DCMTK=OFF
-CMAKE_ARGS+=           -DUSE_Libsquish=OFF
-CMAKE_ARGS+=           -DUSE_Nuke=OFF
-CMAKE_ARGS+=           -DUSE_OpenVDB=OFF
-CMAKE_ARGS+=           -DUSE_Field3D=OFF
+CMAKE_ARGS+=   -DUSE_DCMTK=OFF
+CMAKE_ARGS+=   -DUSE_Libsquish=OFF
+CMAKE_ARGS+=   -DUSE_Nuke=OFF
+CMAKE_ARGS+=   -DUSE_OpenVDB=OFF
+CMAKE_ARGS+=   -DUSE_Field3D=OFF
 
 # disable imageviewer since it requires Qt5 to build
-CMAKE_ARGS+=           -DENABLE_IV=OFF
+CMAKE_ARGS+=   -DENABLE_IV=OFF
 
 # disabled by default in arch linux, freebsd...
-CMAKE_ARGS+=           -DUSE_HDF5=OFF
-CMAKE_ARGS+=           -DUSE_FFmpeg=OFF
-CMAKE_ARGS+=           -DUSE_OpenCV=OFF
+CMAKE_ARGS+=   -DUSE_HDF5=OFF
+CMAKE_ARGS+=   -DUSE_FFmpeg=OFF
+CMAKE_ARGS+=   -DUSE_OpenCV=OFF
 
 # We're using cmake...
 CHECK_PORTABILITY_SKIP+=       Makefile

Index: pkgsrc/graphics/openimageio/PLIST
diff -u pkgsrc/graphics/openimageio/PLIST:1.11 pkgsrc/graphics/openimageio/PLIST:1.12
--- pkgsrc/graphics/openimageio/PLIST:1.11      Sun Oct 15 19:52:09 2023
+++ pkgsrc/graphics/openimageio/PLIST   Wed Jun 26 16:26:24 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2023/10/15 19:52:09 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/06/26 16:26:24 adam Exp $
 bin/iconvert
 bin/idiff
 bin/igrep
@@ -17,6 +17,7 @@ include/OpenImageIO/dassert.h
 include/OpenImageIO/deepdata.h
 include/OpenImageIO/detail/farmhash.h
 include/OpenImageIO/detail/fmt.h
+include/OpenImageIO/detail/fmt/chrono.h
 include/OpenImageIO/detail/fmt/core.h
 include/OpenImageIO/detail/fmt/format-inl.h
 include/OpenImageIO/detail/fmt/format.h
@@ -71,10 +72,10 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
 lib/cmake/OpenImageIO/OpenImageIOTargets.cmake
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.2.5
-lib/libOpenImageIO.so.2.5.4
+lib/libOpenImageIO.so.2.5.12
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.2.5
-lib/libOpenImageIO_Util.so.2.5.4
+lib/libOpenImageIO_Util.so.2.5.12
 lib/pkgconfig/OpenImageIO.pc
 share/doc/OpenImageIO/CHANGES-0.x.md
 share/doc/OpenImageIO/CHANGES-1.x.md

Index: pkgsrc/graphics/openimageio/buildlink3.mk
diff -u pkgsrc/graphics/openimageio/buildlink3.mk:1.71 pkgsrc/graphics/openimageio/buildlink3.mk:1.72
--- pkgsrc/graphics/openimageio/buildlink3.mk:1.71      Fri Dec 29 18:24:48 2023
+++ pkgsrc/graphics/openimageio/buildlink3.mk   Wed Jun 26 16:26:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.71 2023/12/29 18:24:48 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.72 2024/06/26 16:26:24 adam Exp $
 
 BUILDLINK_TREE+=       openimageio
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        openimageio
 OPENIMAGEIO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openimageio+=    openimageio>=2.4.12.0
-BUILDLINK_ABI_DEPENDS.openimageio?=    openimageio>=2.5.4.0nb5
+BUILDLINK_ABI_DEPENDS.openimageio+=    openimageio>=2.5.4.0nb5
 BUILDLINK_PKGSRCDIR.openimageio?=      ../../graphics/openimageio
 
 # these are targets in the cmake config files

Index: pkgsrc/graphics/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.30 pkgsrc/graphics/openimageio/distinfo:1.31
--- pkgsrc/graphics/openimageio/distinfo:1.30   Sun Oct 15 19:52:09 2023
+++ pkgsrc/graphics/openimageio/distinfo        Wed Jun 26 16:26:24 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2023/10/15 19:52:09 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2024/06/26 16:26:24 adam Exp $
 
-BLAKE2s (OpenImageIO-2.5.4.0.tar.gz) = 5655cacf85bc7e60c64e8eb060b6f5ea0115a55dc5abc24e3dc6b88d5e88afd7
-SHA512 (OpenImageIO-2.5.4.0.tar.gz) = db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd
-Size (OpenImageIO-2.5.4.0.tar.gz) = 48107518 bytes
-SHA1 (patch-src_cmake_compiler.cmake) = f7a670d437d7336bbf9317b41f5c951cee757b11
+BLAKE2s (OpenImageIO-2.5.12.0.tar.gz) = 3978fc11a4b7b4d780a497082d85dbeeb3e097951f6922ebce023a8679103bb2
+SHA512 (OpenImageIO-2.5.12.0.tar.gz) = c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4
+Size (OpenImageIO-2.5.12.0.tar.gz) = 52535046 bytes
+SHA1 (patch-src_cmake_compiler.cmake) = d4abc010c5016cfcffab51191b5ea37edbfdd9cc
 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 90efe95bf763881478aea851cce0ea67a9de9c1a
 SHA1 (patch-src_libutil_strutil.cpp) = fd63f4648cd9750d7b9e496c183886d348c2cff5

Index: pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake
diff -u pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake:1.2 pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake:1.3
--- pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake:1.2      Sun Oct 15 19:52:09 2023
+++ pkgsrc/graphics/openimageio/patches/patch-src_cmake_compiler.cmake  Wed Jun 26 16:26:24 2024
@@ -1,13 +1,14 @@
-$NetBSD: patch-src_cmake_compiler.cmake,v 1.2 2023/10/15 19:52:09 ryoon Exp $
+$NetBSD: patch-src_cmake_compiler.cmake,v 1.3 2024/06/26 16:26:24 adam Exp $
 
 Disable custom rpath handling that conflicts with pkgsrc.
 
---- src/cmake/compiler.cmake.orig      2023-10-02 01:17:00.000000000 +0000
+--- src/cmake/compiler.cmake.orig      2024-06-01 19:59:05.000000000 +0000
 +++ src/cmake/compiler.cmake
-@@ -600,30 +600,6 @@ endif ()
+@@ -632,27 +632,6 @@ if (DEFINED ENV{${PROJECT_NAME}_CI})
+ endif ()
  
  
- ###########################################################################
+-###########################################################################
 -# Rpath handling at the install step
 -#
 -# set (MACOSX_RPATH ON)
@@ -28,10 +29,6 @@ Disable custom rpath handling that confl
 -    set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 -    message (VERBOSE "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}")
 -endif ()
--
--
--
--###########################################################################
- # Macro to install targets to the appropriate locations.  Use this instead
- # of the install(TARGETS ...) signature. Note that it adds it to the
- # export targets list for when we generate config files.
+ 
+ 
+ ###########################################################################