openimageio: update to 3.0.6.1.

This commit is contained in:
oreo639 2025-05-08 18:41:22 -07:00 committed by classabbyamp
parent 3b1ed1535d
commit 65af6ad679
3 changed files with 38 additions and 7 deletions

View file

@ -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

View file

@ -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<long long int>'
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<long long int>'
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<uint32_t> { static const TypeDesc::BASETYPE valu
template<> struct BaseTypeFromC<int32_t> { static const TypeDesc::BASETYPE value = TypeDesc::INT; };
template<> struct BaseTypeFromC<uint64_t> { static const TypeDesc::BASETYPE value = TypeDesc::UINT64; };
template<> struct BaseTypeFromC<int64_t> { 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<unsigned long long, uint64_t>);

View file

@ -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 <lemmi@nerd2nerd.org>"
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