From 65af6ad679829deef43b50de45cf24219b0707d7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 8 May 2025 18:41:22 -0700 Subject: [PATCH] openimageio: update to 3.0.6.1. --- common/shlibs | 4 +-- srcpkgs/openimageio/patches/musl-64bit.patch | 31 ++++++++++++++++++++ srcpkgs/openimageio/template | 10 +++---- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/openimageio/patches/musl-64bit.patch diff --git a/common/shlibs b/common/shlibs index 468dac76cbf..38e2982cfaf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2322,8 +2322,8 @@ libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.9.3_4 libxmp.so.4 libxmp-4.3.7_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1 -libOpenImageIO.so.2.5 openimageio-2.5.17.0_1 +libOpenImageIO_Util.so.3.0 openimageio-3.0.6.1_1 +libOpenImageIO.so.3.0 openimageio-3.0.6.1_1 libOpenColorIO.so.2.4 opencolorio-2.4.2_1 libpystring.so.1 pystring-1.1.3_1 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1 diff --git a/srcpkgs/openimageio/patches/musl-64bit.patch b/srcpkgs/openimageio/patches/musl-64bit.patch new file mode 100644 index 00000000000..6d4b2a8e8af --- /dev/null +++ b/srcpkgs/openimageio/patches/musl-64bit.patch @@ -0,0 +1,31 @@ +Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/openimageio/0001-fix-compile-error.patch + +Fixes the following compiler error: +/builddir/openimageio-3.0.6.1/src/libtexture/imagecache.cpp: In member function 'bool OpenImageIO_v3_0::ImageCacheImpl::getattribute(OpenImageIO_v3_0::string_view, OpenImageIO_v3_0::TypeDesc, void*) const': +/builddir/openimageio-3.0.6.1/src/libtexture/imagecache.cpp:2411:57: error: 'value' is not a member of 'OpenImageIO_v3_0::BaseTypeFromC' + 2411 | if (name == _name && type == BaseTypeFromC<_ctype>::value) { \ + | ^~~~~ +/builddir/openimageio-3.0.6.1/src/libtexture/imagecache.cpp:2483:9: note: in expansion of macro 'ATTR_DECODE' + 2483 | ATTR_DECODE("stat:cache_footprint", long long, pvt::footprint(*this)); + | ^~~~~~~~~~~ +/builddir/openimageio-3.0.6.1/src/libtexture/imagecache.cpp:2411:57: error: 'value' is not a member of 'OpenImageIO_v3_0::BaseTypeFromC' + 2411 | if (name == _name && type == BaseTypeFromC<_ctype>::value) { \ + | ^~~~~ +/builddir/openimageio-3.0.6.1/src/libtexture/imagecache.cpp:2484:9: note: in expansion of macro 'ATTR_DECODE' + 2484 | ATTR_DECODE("stat:cache_memory_used", long long, m_mem_used); + | ^~~~~~~~~~~ +... + +diff --git a/src/include/OpenImageIO/typedesc.h b/src/include/OpenImageIO/typedesc.h +index b6ac37c..779e320 100644 +--- a/src/include/OpenImageIO/typedesc.h ++++ b/src/include/OpenImageIO/typedesc.h +@@ -401,7 +401,7 @@ template<> struct BaseTypeFromC { static const TypeDesc::BASETYPE valu + template<> struct BaseTypeFromC { static const TypeDesc::BASETYPE value = TypeDesc::INT; }; + template<> struct BaseTypeFromC { static const TypeDesc::BASETYPE value = TypeDesc::UINT64; }; + template<> struct BaseTypeFromC { static const TypeDesc::BASETYPE value = TypeDesc::INT64; }; +-#if defined(__GNUC__) && __WORDSIZE == 64 && !(defined(__APPLE__) && defined(__MACH__)) ++#if defined(__GNUC__) && defined(__LP64__) + // Some platforms consider int64_t and long long to be different types, even + // though they are actually the same size. + static_assert(!std::is_same_v); diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index d0409296f1c..b6ed4fd3df1 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,11 +1,11 @@ # Template file for 'openimageio' pkgname=openimageio -version=2.5.17.0 +version=3.0.6.1 revision=1 build_style=cmake build_helper=qemu configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 - -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14 + -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=17 -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF" hostmakedepends="pkg-config git" makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel @@ -16,9 +16,9 @@ short_desc="Library for reading and writing images" maintainer="lemmi " license="BSD-3-Clause" homepage="https://sites.google.com/site/openimageio/home" -changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" -distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz" -checksum=9cf1b98762ce5aa5f3f7cd34672549034f5716da1eba26eb5173c18aa21e6583 +changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenImageIO/release/CHANGES.md" +distfiles="https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v${version}/OpenImageIO-${version}.tar.gz" +checksum=854e82faa1a9d6ead0a26001a0145714232ce98d15b5693484c07345cb6aa057 # Runs checks even for features we disabled. make_check=no