public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2019-07-16 15:14 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-07-16 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     bebd2316cf3283bfc26293acf4afd4e8fd4085c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 15:13:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 15:14:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebd2316

media-libs/openimageio: Fix USE python

Closes: https://bugs.gentoo.org/688750
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/openimageio-1.8.17-boostpython.patch     | 28 ++++++++++++++++++++++
 .../openimageio/openimageio-1.8.17-r1.ebuild       |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
new file mode 100644
index 00000000000..970ada64a1f
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
@@ -0,0 +1,28 @@
+From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:03:40 +0200
+Subject: [PATCH] Find Boost_PYTHON
+
+---
+ src/python/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index e58d372d..98d91c48 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
+ if (NOT BOOST_CUSTOM)
+     # Finding the python component for boost is a little tricky, since it has
+     # different names on different systems. Try the most common ones.
+-    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
+-             python${PYTHON_VERSION_MAJOR}
+-             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++    foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
++             python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+         find_package (Boost QUIET COMPONENTS ${_py_lib})
+         string (TOUPPER ${_py_lib} _py_lib_name)
+         if (Boost_${_py_lib_name}_FOUND)
+-- 
+2.22.0
+

diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
index dd606a1dc50..23d889796d6 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
@@ -72,6 +72,8 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
 
+PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
+
 S="${WORKDIR}/oiio-Release-${PV}"
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2020-10-08 21:23 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-10-08 21:23 UTC (permalink / raw
  To: gentoo-commits

commit:     a74a1df3530a8d5abbedef5635d7eeae05310990
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Oct  1 11:24:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 20:16:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74a1df3

media-libs/openimageio: version bump

new maintainer with science
keyword ppc64 on closing of
Bug: https://bugs.gentoo.org/746011
Bug: https://bugs.gentoo.org/746014
Bug: https://bugs.gentoo.org/745783

Closes: https://bugs.gentoo.org/678294
Closes: https://bugs.gentoo.org/735598

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/17728
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |   1 +
 .../files/openimageio-2.2.6.1-pugixml.patch        |  21 ++++
 media-libs/openimageio/metadata.xml                |  10 +-
 media-libs/openimageio/openimageio-2.2.6.1.ebuild  | 139 +++++++++++++++++++++
 4 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 217a10ddff0..641925b4be0 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1 +1,2 @@
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
+DIST openimageio-2.2.6.1.tar.gz 29187970 BLAKE2B 857659892009e1638b923e7f28d29d7a1416641284ead714373875a74b7607205c6bc6810179d63bb066034a32452e0f4c2b78a0578b006e87602c43f8a34783 SHA512 a23fa75d5de589ce6f73ff17870cd1df764bb92a0dbc32b36d0e799b30705e1f174e0763150d27611c0efa07a21cb7636508e3135942ee7c56d0d59940d3a053

diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
new file mode 100644
index 00000000000..d5cef06d38d
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
@@ -0,0 +1,21 @@
+https://github.com/OpenImageIO/oiio/issues/2732
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 1240f22..5cc5a2e 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -227,6 +227,14 @@ endif ()
+ # allow this to be overridden to use the distro-provided package if desired.
+ option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
+ if (USE_EXTERNAL_PUGIXML)
++    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
++    find_library (PUGIXML_LIBRARIES NAMES pugixml)
++
++    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
++    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
++
+     checked_find_package (pugixml REQUIRED
+                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
+ endif()

diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 4593e8d4cbf..592d071e5e5 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
+		<flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
 	</use>
 	<upstream>

diff --git a/media-libs/openimageio/openimageio-2.2.6.1.ebuild b/media-libs/openimageio/openimageio-2.2.6.1.ebuild
new file mode 100644
index 00000000000..a1d2dcbdc3a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.6.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sci-libs/dcmtk
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy:=[${PYTHON_USEDEP}]
+			dev-python/pybind11:=[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+PATCHES=( "${FILESDIR}"/${P}-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2022-02-15 19:51 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9988b26e89cfe41f05da7aa37685aa51e110808f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 17:57:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9988b26e

media-libs/openimageio: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833158
Closes: https://bugs.gentoo.org/833194
Closes: https://bugs.gentoo.org/831357
Closes: https://bugs.gentoo.org/832862
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../openimageio-2.3.11.0-imath-openexr-3.patch     | 302 ---------------------
 ....0-r1.ebuild => openimageio-2.3.12.0-r2.ebuild} |  21 +-
 2 files changed, 3 insertions(+), 320 deletions(-)

diff --git a/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch b/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch
deleted file mode 100644
index ad6ee04c16e6..000000000000
--- a/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff --git a/src/dpx.imageio/dpxinput.cpp b/src/dpx.imageio/dpxinput.cpp
-index edfeb02..7890b46 100644
---- a/src/dpx.imageio/dpxinput.cpp
-+++ b/src/dpx.imageio/dpxinput.cpp
-@@ -6,7 +6,7 @@
- #include <iomanip>
- #include <memory>
- 
--#include <OpenEXR/ImfTimeCode.h>  //For TimeCode support
-+#include <OpenEXR-3/ImfTimeCode.h>  //For TimeCode support
- 
- // Note: libdpx originally from: https://github.com/PatrickPalmer/dpx
- // But that seems not to be actively maintained.
-diff --git a/src/field3d.imageio/field3d_pvt.h b/src/field3d.imageio/field3d_pvt.h
-index 066574f..19b4ac9 100644
---- a/src/field3d.imageio/field3d_pvt.h
-+++ b/src/field3d.imageio/field3d_pvt.h
-@@ -8,7 +8,7 @@
- #include <OpenImageIO/Imath.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
- #else
- #    include <OpenEXR/ImathBox.h>
- #endif
-diff --git a/src/include/OpenImageIO/Imath.h.in b/src/include/OpenImageIO/Imath.h.in
-index 7f13fae..23afffc 100644
---- a/src/include/OpenImageIO/Imath.h.in
-+++ b/src/include/OpenImageIO/Imath.h.in
-@@ -13,10 +13,10 @@
- #define OIIO_USING_IMATH @OIIO_USING_IMATH@
- 
- #if OIIO_USING_IMATH >= 3
--#   include <Imath/ImathColor.h>
--#   include <Imath/ImathMatrix.h>
--#   include <Imath/ImathVec.h>
--#   include <Imath/half.h>
-+#   include <Imath-3/ImathColor.h>
-+#   include <Imath-3/ImathMatrix.h>
-+#   include <Imath-3/ImathVec.h>
-+#   include <Imath-3/half.h>
- #else
- #   include <OpenEXR/ImathColor.h>
- #   include <OpenEXR/ImathMatrix.h>
-diff --git a/src/libOpenImageIO/imagebufalgo_xform.cpp b/src/libOpenImageIO/imagebufalgo_xform.cpp
-index 496a055..6484ccc 100644
---- a/src/libOpenImageIO/imagebufalgo_xform.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_xform.cpp
-@@ -18,7 +18,7 @@
- #include <OpenImageIO/thread.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
- #else
- #    include <OpenEXR/ImathBox.h>
- #endif
-diff --git a/src/libutil/fmath_test.cpp b/src/libutil/fmath_test.cpp
-index ea4e708..ed7e1ff 100644
---- a/src/libutil/fmath_test.cpp
-+++ b/src/libutil/fmath_test.cpp
-@@ -18,7 +18,7 @@
- #include <OpenImageIO/unittest.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathFun.h>
-+#    include <Imath-3/ImathFun.h>
- #else
- #    include <OpenEXR/ImathFun.h>
- #endif
-diff --git a/src/libutil/typedesc_test.cpp b/src/libutil/typedesc_test.cpp
-index 6840738..58f6a64 100644
---- a/src/libutil/typedesc_test.cpp
-+++ b/src/libutil/typedesc_test.cpp
-@@ -9,12 +9,14 @@
- #include <OpenImageIO/Imath.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
-+#    include <OpenEXR-3/ImfKeyCode.h>
-+#    include <OpenEXR-3/ImfTimeCode.h>
- #else
- #    include <OpenEXR/ImathBox.h>
-+#    include <OpenEXR/ImfKeyCode.h>
-+#    include <OpenEXR/ImfTimeCode.h>
- #endif
--#include <OpenEXR/ImfKeyCode.h>
--#include <OpenEXR/ImfTimeCode.h>
- 
- #include <OpenImageIO/typedesc.h>
- #include <OpenImageIO/unittest.h>
-diff --git a/src/oiiotool/oiiotool.cpp b/src/oiiotool/oiiotool.cpp
-index 0f5e739..4292b50 100644
---- a/src/oiiotool/oiiotool.cpp
-+++ b/src/oiiotool/oiiotool.cpp
-@@ -17,7 +17,7 @@
- #include <utility>
- #include <vector>
- 
--#include <OpenEXR/ImfTimeCode.h>
-+#include <OpenEXR-3/ImfTimeCode.h>
- 
- #include <OpenImageIO/argparse.h>
- #include <OpenImageIO/color.h>
-diff --git a/src/openexr.imageio/exrinput.cpp b/src/openexr.imageio/exrinput.cpp
-index d9c51ab..8b86ad8 100644
---- a/src/openexr.imageio/exrinput.cpp
-+++ b/src/openexr.imageio/exrinput.cpp
-@@ -25,11 +25,11 @@ using boost::integer::gcd;
- using boost::math::gcd;
- #endif
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfEnvmap.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <OpenEXR-3/ImfChannelList.h>
-+#include <OpenEXR-3/ImfEnvmap.h>
-+#include <OpenEXR-3/ImfInputFile.h>
-+#include <OpenEXR-3/ImfTestFile.h>
-+#include <OpenEXR-3/ImfTiledInputFile.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-@@ -40,7 +40,7 @@ using boost::math::gcd;
- #endif
- 
- #if OPENEXR_CODED_VERSION >= 20400 \
--    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
-+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
- #    define OPENEXR_HAS_FLOATVECTOR 1
- #else
- #    define OPENEXR_HAS_FLOATVECTOR 0
-@@ -51,37 +51,37 @@ using boost::math::gcd;
- OIIO_PRAGMA_VISIBILITY_PUSH
- OIIO_PRAGMA_WARNING_PUSH
- OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
--#include <OpenEXR/IexBaseExc.h>
--#include <OpenEXR/IexThrowErrnoExc.h>
--#include <OpenEXR/ImfBoxAttribute.h>
--#include <OpenEXR/ImfChromaticitiesAttribute.h>
--#include <OpenEXR/ImfCompressionAttribute.h>
--#include <OpenEXR/ImfDeepFrameBuffer.h>
--#include <OpenEXR/ImfDeepScanLineInputPart.h>
--#include <OpenEXR/ImfDeepTiledInputPart.h>
--#include <OpenEXR/ImfDoubleAttribute.h>
--#include <OpenEXR/ImfEnvmapAttribute.h>
--#include <OpenEXR/ImfFloatAttribute.h>
--#include <OpenEXR/ImfHeader.h>
-+#include <OpenEXR-3/IexBaseExc.h>
-+#include <OpenEXR-3/IexThrowErrnoExc.h>
-+#include <OpenEXR-3/ImfBoxAttribute.h>
-+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
-+#include <OpenEXR-3/ImfCompressionAttribute.h>
-+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
-+#include <OpenEXR-3/ImfDeepScanLineInputPart.h>
-+#include <OpenEXR-3/ImfDeepTiledInputPart.h>
-+#include <OpenEXR-3/ImfDoubleAttribute.h>
-+#include <OpenEXR-3/ImfEnvmapAttribute.h>
-+#include <OpenEXR-3/ImfFloatAttribute.h>
-+#include <OpenEXR-3/ImfHeader.h>
- #if OPENEXR_HAS_FLOATVECTOR
--#    include <OpenEXR/ImfFloatVectorAttribute.h>
-+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
- #endif
--#include <OpenEXR/ImfInputPart.h>
--#include <OpenEXR/ImfIntAttribute.h>
--#include <OpenEXR/ImfKeyCodeAttribute.h>
--#include <OpenEXR/ImfMatrixAttribute.h>
--#include <OpenEXR/ImfMultiPartInputFile.h>
--#include <OpenEXR/ImfPartType.h>
--#include <OpenEXR/ImfRationalAttribute.h>
--#include <OpenEXR/ImfStringAttribute.h>
--#include <OpenEXR/ImfStringVectorAttribute.h>
--#include <OpenEXR/ImfTiledInputPart.h>
--#include <OpenEXR/ImfTimeCodeAttribute.h>
--#include <OpenEXR/ImfVecAttribute.h>
-+#include <OpenEXR-3/ImfInputPart.h>
-+#include <OpenEXR-3/ImfIntAttribute.h>
-+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
-+#include <OpenEXR-3/ImfMatrixAttribute.h>
-+#include <OpenEXR-3/ImfMultiPartInputFile.h>
-+#include <OpenEXR-3/ImfPartType.h>
-+#include <OpenEXR-3/ImfRationalAttribute.h>
-+#include <OpenEXR-3/ImfStringAttribute.h>
-+#include <OpenEXR-3/ImfStringVectorAttribute.h>
-+#include <OpenEXR-3/ImfTiledInputPart.h>
-+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
-+#include <OpenEXR-3/ImfVecAttribute.h>
- OIIO_PRAGMA_WARNING_POP
- OIIO_PRAGMA_VISIBILITY_POP
- 
--#include <OpenEXR/ImfCRgbaFile.h>
-+#include <OpenEXR-3/ImfCRgbaFile.h>
- 
- #if OPENEXR_CODED_VERSION >= 30100 && defined(OIIO_USE_EXR_C_API)
- #    define USE_OPENEXR_CORE
-diff --git a/src/openexr.imageio/exrinput_c.cpp b/src/openexr.imageio/exrinput_c.cpp
-index 4376333..1c566da 100644
---- a/src/openexr.imageio/exrinput_c.cpp
-+++ b/src/openexr.imageio/exrinput_c.cpp
-@@ -25,7 +25,7 @@ using boost::integer::gcd;
- using boost::math::gcd;
- #endif
- 
--#include <OpenEXR/openexr.h>
-+#include <OpenEXR-3/openexr.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-diff --git a/src/openexr.imageio/exroutput.cpp b/src/openexr.imageio/exroutput.cpp
-index e11cf0c..0fd2295 100644
---- a/src/openexr.imageio/exroutput.cpp
-+++ b/src/openexr.imageio/exroutput.cpp
-@@ -13,10 +13,10 @@
- 
- #include <OpenImageIO/platform.h>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfEnvmap.h>
--#include <OpenEXR/ImfOutputFile.h>
--#include <OpenEXR/ImfTiledOutputFile.h>
-+#include <OpenEXR-3/ImfChannelList.h>
-+#include <OpenEXR-3/ImfEnvmap.h>
-+#include <OpenEXR-3/ImfOutputFile.h>
-+#include <OpenEXR-3/ImfTiledOutputFile.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-@@ -27,7 +27,7 @@
- #endif
- 
- #if OPENEXR_CODED_VERSION >= 20400 \
--    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
-+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
- #    define OPENEXR_HAS_FLOATVECTOR 1
- #else
- #    define OPENEXR_HAS_FLOATVECTOR 0
-@@ -38,34 +38,34 @@
- OIIO_PRAGMA_VISIBILITY_PUSH
- OIIO_PRAGMA_WARNING_PUSH
- OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
--#include <OpenEXR/IexBaseExc.h>
--#include <OpenEXR/ImfBoxAttribute.h>
--#include <OpenEXR/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
--#include <OpenEXR/ImfChromaticitiesAttribute.h>
--#include <OpenEXR/ImfCompressionAttribute.h>
--#include <OpenEXR/ImfEnvmapAttribute.h>
--#include <OpenEXR/ImfFloatAttribute.h>
-+#include <OpenEXR-3/IexBaseExc.h>
-+#include <OpenEXR-3/ImfBoxAttribute.h>
-+#include <OpenEXR-3/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
-+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
-+#include <OpenEXR-3/ImfCompressionAttribute.h>
-+#include <OpenEXR-3/ImfEnvmapAttribute.h>
-+#include <OpenEXR-3/ImfFloatAttribute.h>
- #if OPENEXR_HAS_FLOATVECTOR
--#    include <OpenEXR/ImfFloatVectorAttribute.h>
-+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
- #endif
--#include <OpenEXR/ImfHeader.h>
--#include <OpenEXR/ImfIntAttribute.h>
--#include <OpenEXR/ImfKeyCodeAttribute.h>
--#include <OpenEXR/ImfMatrixAttribute.h>
--#include <OpenEXR/ImfRationalAttribute.h>
--#include <OpenEXR/ImfStringAttribute.h>
--#include <OpenEXR/ImfTimeCodeAttribute.h>
--#include <OpenEXR/ImfVecAttribute.h>
--
--#include <OpenEXR/ImfDeepFrameBuffer.h>
--#include <OpenEXR/ImfDeepScanLineOutputPart.h>
--#include <OpenEXR/ImfDeepTiledOutputPart.h>
--#include <OpenEXR/ImfDoubleAttribute.h>
--#include <OpenEXR/ImfMultiPartOutputFile.h>
--#include <OpenEXR/ImfOutputPart.h>
--#include <OpenEXR/ImfPartType.h>
--#include <OpenEXR/ImfStringVectorAttribute.h>
--#include <OpenEXR/ImfTiledOutputPart.h>
-+#include <OpenEXR-3/ImfHeader.h>
-+#include <OpenEXR-3/ImfIntAttribute.h>
-+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
-+#include <OpenEXR-3/ImfMatrixAttribute.h>
-+#include <OpenEXR-3/ImfRationalAttribute.h>
-+#include <OpenEXR-3/ImfStringAttribute.h>
-+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
-+#include <OpenEXR-3/ImfVecAttribute.h>
-+
-+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
-+#include <OpenEXR-3/ImfDeepScanLineOutputPart.h>
-+#include <OpenEXR-3/ImfDeepTiledOutputPart.h>
-+#include <OpenEXR-3/ImfDoubleAttribute.h>
-+#include <OpenEXR-3/ImfMultiPartOutputFile.h>
-+#include <OpenEXR-3/ImfOutputPart.h>
-+#include <OpenEXR-3/ImfPartType.h>
-+#include <OpenEXR-3/ImfStringVectorAttribute.h>
-+#include <OpenEXR-3/ImfTiledOutputPart.h>
- OIIO_PRAGMA_WARNING_POP
- OIIO_PRAGMA_VISIBILITY_POP
- 

diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
similarity index 88%
rename from media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
rename to media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
index 79438a824283..bd66deec7c82 100644
--- a/media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
 TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1 flag-o-matic
+inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -56,8 +56,8 @@ RDEPEND="
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
 	dev-libs/imath:=
-	>=media-libs/opencolorio-2.1.1-r3:=
-	media-libs/openexr:3=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	media-libs/openexr:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
@@ -97,24 +97,11 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES.md CREDITS.md README.md )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.11.0-imath-openexr-3.patch
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
-	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
-	# (because it mix and matches which version it uses; sed this to
-	# make sure it'll use OpenEXR 3 if it can, but it won't.)
-	# bug #821193
-	#sed -i \
-	#	-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
-	#	src/cmake/modules/FindOpenEXR.cmake || die
-
 	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
 
@@ -136,8 +123,6 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	append-cppflags -DOIIO_USING_OPENEXR_3
-
 	local mycmakeargs=(
 		-DVERBOSE=ON
 		-DBUILD_TESTING=$(usex test)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2024-03-18 16:35 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-03-18 16:35 UTC (permalink / raw
  To: gentoo-commits

commit:     38086577ee0a6b8515ea62f2dfc7f47b6b031bf3
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Feb  2 17:05:25 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 16:33:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38086577

media-libs/openimageio: add 2.5.9.0

Fixed tests by adjusting fp-comparison threshold

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35377
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |  14 ++
 .../files/openimageio-2.5.8.0-fits.patch           |  19 ++
 .../files/openimageio-2.5.8.0-fix-tests.patch      | 230 ++++++++++++++++++
 .../files/openimageio-2.5.8.0-fix-unit_simd.patch  |  18 ++
 media-libs/openimageio/metadata.xml                |   1 +
 media-libs/openimageio/openimageio-2.5.9.0.ebuild  | 262 +++++++++++++++++++++
 6 files changed, 544 insertions(+)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 8cd680342d81..f312d364a6d0 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,3 +1,9 @@
+DIST J2KP4files.zip 52204801 BLAKE2B 9e1c9afc11dc9e9be9987d458c274902f4205a5838a22bccd990699cfe1612139703d0ecc10fa77eacf5d246739025ddf57a02d91b80d3acfa1bae8377044b24 SHA512 71822f8b2518c4a7a5e195700d0e960a4b900e5b36ddfd2498e5a1e4e149ae3ea0262c51a24a7081119aa5d00772d45d1b0bab836bbca0557c2e9bb9a88b89f4
+DIST file001.fits 11520 BLAKE2B 6d608a563ef4eb83df6d86b2d117e27666222c338e830700be9387cc8a5a0a032c23ec51669a19a0e8cdca8e79e4b8114b6ac36c8aed75e59f6c9dfc4c98231e SHA512 eb8fb79c2c336204129bc43aff2c558c07c72040341f4f5d985baeae14a615c5f02e1ffb47f4c6bb79790f9d0e0d606872ec2f2a656335be6b2777552f3a935e
+DIST file002.fits 11520 BLAKE2B e1983941ca932f9db088f2d1856ca3b1fd268cf8d30e1885bf3b4d755608f581b3906a028d5d2bc805457b8a297ea069f8f3a2b954a6d2b3c2b1e1e8d1429cd2 SHA512 7829fb873d282ab29368909bf94665f9d62a0af75c4d7ce882d7c5f46cd00b6d157a7d2ac5d1b8c8a5a62d2277494d12dcb14042964f7185938610624b228160
+DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c041a1e1ef7ad9846a711fafb71ba71b191a7dc44cd94ae7172640210a5c48e2910d34efea4c20989e1 SHA512 dc143b27f8850e2a55ad95a9a7a76a348f0b9b0af5a223d1ae11157eb358acf74e482957faaa0cdbaf260b9cbe14b10e6b504068c7b312f059119c022279611f
+DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8
+DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a
 DIST openimageio-2.4.12.0.tar.gz 32157951 BLAKE2B dd7dd7b641266a7c575eafbc258ffc4b298236043960ae6ef878f46cd3ec3342f3be5b9a14459724578abc6390318666e43e8835ef6b2f25bc05a52002c7096f SHA512 5a0b9e6b634326be051dac46d2145149e9ff3e33d60d05728420d156431d6aa85186706b5f5b66ab820f4cd97f68d049a76e2da13f99e457135360f56fb5a257
 DIST openimageio-2.4.13.0.tar.gz 32162857 BLAKE2B 43d6c16fb9dfba2e01ea6a7b68e8c72ec0c11be0d42d96e476a79b7972bcf61f2ac377009493e8fa9367001cc788a1453f8c0f1cf061a204f9da4b9f713d5554 SHA512 9e887c7039995ce7c41556e09a7eed940863260a522ecf7d9bec300189026ed507da560620dfa4a619deeb679be7adf42fe3a7020ff3094df777c7934c771227
 DIST openimageio-2.4.14.0.tar.gz 47890469 BLAKE2B 53865ab493a586a1e4fdc6f81a90f7ae3847556a09a9c19ade48cbe5d8e3f807d864a2409a468613b1a55c128d5f5e119f1f2a70fc44b1a5293c99c3431cc69f SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f
@@ -6,7 +12,15 @@ DIST openimageio-2.4.16.0.tar.gz 47894563 BLAKE2B 02788bb7ccc9bbcb84a44df0c86252
 DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5
 DIST openimageio-2.5.4.0.tar.gz 48107518 BLAKE2B 38ba0f01976cfbe0f81c04fe8e64ff9c5ab530204d45a7b566882a7ec31c378c61a9b6bc62d6453c51e7ed33cd514a758b5d8224a646e568c9abd6274ebc6b0c SHA512 db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd
 DIST openimageio-2.5.5.0.tar.gz 52025462 BLAKE2B d8d88d5e89815525fe7e75983b8d373058901614dcea9743a3851e242aa5f076b81ef3cc18764063e456ed9b79758d146c5d862be3a45d3671c59c7195acfa51 SHA512 d8ac989a6c7007089e3a29723889c9b9644d23ca9da1606da9f8c6bd7c0b301cf6a03f57c8eaaaca2a2fb2f3e79291f9dfa46ed31240a15d4650b83bf93ce96d
+DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6
 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521
+DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
+DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4
+DIST tst0005.fits 48960 BLAKE2B ef8bb62702f579c8500721835100e150b2ca73272866a88457589d6f14b407efb41d106be2d454089dae00c04b903bb874132d5b44852245e6d4372ed20c7b6f SHA512 515a4dbca51e5b7fa0139b369066c02fcfa96eeffb471c6f5073343ab50da527ee610d9b677e6fabdaad1b7f9f9c68bd65eb71c5b944e5ffacf429d01fe14a39
+DIST tst0006.fits 112320 BLAKE2B 1e3df92d994c1d0cfbf18956b124cc85510ae2dbbdbc5289e32e9a1b75b8ef4d7c0be2632d7eeb261a718954aa8a4fddeea7ef45b6461026fce1d92ae0fb56e3 SHA512 080ceea065a4a3a8f4c3fdb04e0acde77dd876c984500af096bf0ea3ca0724c442923eb4c2dc3c9073228ee8bdf4f91a8cf3ce06bb793333171e7b61e4c1889d
+DIST tst0007.fits 8640 BLAKE2B cf6eaff174e88bbd27f642964e6b3e5502cb08742d465a7cabb7aeaf284838f44660b5fa98c17df3c28f5986ecf657d8ec011579e3d9d62e63ce2171c157fd91 SHA512 ee8359132031678fa5e37f3b44642f41a7f64b251c3e788fbb756ad761327c1e1243df2b718cfe246449198d4e642b36fd43c61308ac434121ad4eadb3b2aaa3
+DIST tst0008.fits 8640 BLAKE2B 7b4213cef2106cf0e298fce1ba3b28e74ba6ed26a2441650af297384b46c22910af8a36c2693c1c0e5aed6196561a8e4b4c75cde54541ea7a1a9d684a41f2f40 SHA512 c2dc77eb54cfc48bc97228a06e25cc5b4b2a8f32f417d5a34bb6794b020b277e144b1d5c71f09a44c94e05797c99f318de3f8705eabd22b44ac1b47fe601f918
+DIST tst0013.fits 72000 BLAKE2B 6ca11cd033782adc8f359217e30752b47623c317aa155dc1bae43a0a019f7d5f9d4ba9c7349e99ee14f2d6498d5d166597606721b251b1b2dc039fbe400d00a3 SHA512 c816642e89e3bfdce38a4f755e84a12af35c9da48916abb66bcabf2f899201dfba3c988f929395092921a53a6d94922d84d325334e9bd8d348cdb305878ccb6a

diff --git a/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch b/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch
new file mode 100644
index 000000000000..1ef05f817202
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch
@@ -0,0 +1,19 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make fits test images download optional
+Make j2k test images download optional
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index b671def..ff84b7d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
+     oiio_get_test_data (openexr-images
+                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
+                         BRANCH main)
++    if(ENABLE_FITS)
+     oiio_get_test_data (fits-images)
++    endif()
++    if(OPENJPEG_FOUND)
+     oiio_get_test_data (j2kp4files_v1_5)
++    endif()
+ endfunction ()

diff --git a/media-libs/openimageio/files/openimageio-2.5.8.0-fix-tests.patch b/media-libs/openimageio/files/openimageio-2.5.8.0-fix-tests.patch
new file mode 100644
index 000000000000..6ef92d72424e
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.8.0-fix-tests.patch
@@ -0,0 +1,230 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Fix broken tests
+
+diff --git a/testsuite/oiiotool-text/run.py b/testsuite/oiiotool-text/run.py
+index bbb7372..33c4d91 100755
+--- a/testsuite/oiiotool-text/run.py
++++ b/testsuite/oiiotool-text/run.py
+@@ -47,7 +47,7 @@ outputs = [ "text.tif", "aligned.tif", "textshadowed.tif", "textalpha.tif" ]
+ # on Windows.
+ if os.name != "nt" :
+     command += oiiotool ("--create 320x240 3 "
+-                "--text:x=25:y=50:font=DroidSerif 'test: éèúçàïö€' "
++                "--text:x=25:y=50:font=DroidSerif 'test: éèúçàïö' "
+                 "-d uint8 -o unicode.tif")
+     outputs += [ "unicode.tif" ]
+ 
+diff --git a/testsuite/python-imagebufalgo/run.py b/testsuite/python-imagebufalgo/run.py
+index 33ac8f0..5c7dc1d 100755
+--- a/testsuite/python-imagebufalgo/run.py
++++ b/testsuite/python-imagebufalgo/run.py
+@@ -27,7 +27,7 @@ outputs = ["black.tif", "filled.tif", "checker.tif",
+            "chanshuffle.tif", "ch-rgba.exr", "ch-z.exr",
+            "chappend-rgbaz.exr",
+            "flat.exr", "deepen.exr",
+-           "crop.tif", "cut.tif", "pasted.tif",
++           "cut.tif", "pasted.tif",
+            "rotate90.tif", "rotate180.tif", "rotate270.tif",
+            "rotated.tif", "rotated-offcenter.tif",
+            "warped.tif",
+diff --git a/testsuite/texture-interp-bilinear/run.py b/testsuite/texture-interp-bilinear/run.py
+index 0617c83..8f85f90 100755
+--- a/testsuite/texture-interp-bilinear/run.py
++++ b/testsuite/texture-interp-bilinear/run.py
+@@ -4,6 +4,9 @@
+ # SPDX-License-Identifier: Apache-2.0
+ # https://github.com/AcademySoftwareFoundation/OpenImageIO
+
++# Adjust error thresholds a tad to account for platform-to-platform variation
++# in some math precision.
++hardfail = 0.036
+
+ command = testtex_command ("../common/textures/grid.tx",
+                            extraargs = "-interpmode 1  -d uint8 -o out.tif")
+diff --git a/testsuite/texture-interp-closest/run.py b/testsuite/texture-interp-closest/run.py
+index e226f44..c2c471c 100755
+--- a/testsuite/texture-interp-closest/run.py
++++ b/testsuite/texture-interp-closest/run.py
+@@ -7,8 +7,8 @@
+
+ # Adjust error thresholds a tad to account for platform-to-platform variation
+ # in some math precision.
+-hardfail = 0.032
+-failpercent = 0.002
++hardfail = 0.12
++failpercent = 0.015
+
+ command = testtex_command ("../common/textures/grid.tx",
+                            extraargs = "-interpmode 0  -d uint8 -o out.tif")
+diff --git a/testsuite/texture-levels-stochaniso/run.py b/testsuite/texture-levels-stochaniso/run.py
+index 92272c4..7259564 100755
+--- a/testsuite/texture-levels-stochaniso/run.py
++++ b/testsuite/texture-levels-stochaniso/run.py
+@@ -9,7 +9,7 @@
+ # in some math precision.
+ hardfail = 0.16
+ failpercent = 0.001
+-allowfailures = 1
++allowfailures = 7
+
+ command = testtex_command ("../oiio-images/miplevels.tx",
+                            extraargs = "--stochastic 3 -bluenoise -d uint8 -o out.tif")
+diff --git a/testsuite/texture-levels-stochmip/run.py b/testsuite/texture-levels-stochmip/run.py
+index c42acb7..8810f53 100755
+--- a/testsuite/texture-levels-stochmip/run.py
++++ b/testsuite/texture-levels-stochmip/run.py
+@@ -9,7 +9,7 @@
+ # in some math precision.
+ hardfail = 0.16
+ failpercent = 0.001
+-allowfailures = 1
++allowfailures = 9
+
+ command = testtex_command ("../oiio-images/miplevels.tx",
+                            extraargs = "-stochastic 1 -bluenoise -d uint8 -o out.tif")
+diff --git a/testsuite/texture-mip-onelevel/run.py b/testsuite/texture-mip-onelevel/run.py
+index 6093e60..2a90a09 100755
+--- a/testsuite/texture-mip-onelevel/run.py
++++ b/testsuite/texture-mip-onelevel/run.py
+@@ -5,6 +5,10 @@
+ # https://github.com/AcademySoftwareFoundation/OpenImageIO
+
+
++# Adjust error thresholds a tad to account for platform-to-platform variation
++# in some math precision.
++allowfailures = 6
++
+ command = testtex_command ("../common/textures/grid.tx",
+                            extraargs = "-mipmode 2  -d uint8 -o out.tif")
+ outputs = [ "out.tif" ]
+diff --git a/testsuite/texture-mip-stochasticaniso/run.py b/testsuite/texture-mip-stochasticaniso/run.py
+index 1a85243..0284710 100755
+--- a/testsuite/texture-mip-stochasticaniso/run.py
++++ b/testsuite/texture-mip-stochasticaniso/run.py
+@@ -9,7 +9,7 @@
+ # in some math precision.
+ hardfail = 0.16
+ failpercent = 0.001
+-allowfailures = 1
++allowfailures = 15
+
+ command = testtex_command ("../common/textures/grid.tx",
+                            extraargs = "-stochastic 1 -d uint8 -o out.tif")
+diff --git a/testsuite/texture-mip-stochastictrilinear/run.py b/testsuite/texture-mip-stochastictrilinear/run.py
+index 56b6091..3ba6b7d 100755
+--- a/testsuite/texture-mip-stochastictrilinear/run.py
++++ b/testsuite/texture-mip-stochastictrilinear/run.py
+@@ -5,6 +5,10 @@
+ # https://github.com/AcademySoftwareFoundation/OpenImageIO
+
+
++# Adjust error thresholds a tad to account for platform-to-platform variation
++# in some math precision.
++allowfailures = 9
++
+ command = testtex_command ("../common/textures/grid.tx",
+                            extraargs = "-mipmode 3 -stochastic 1 -d uint8 -o out.tif")
+ outputs = [ "out.tif" ]
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index ff84b7d..372c811 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -85,7 +85,7 @@ macro (oiio_add_tests)
+     elseif (_ats_IMAGEDIR AND NOT EXISTS ${_ats_testdir})
+         # If the directory containing reference data (images) for the test
+         # isn't found, point the user at the URL.
+-        message (STATUS "\n\nDid not find ${_ats_testdir}")
++        message (STATUS "\n\nDid not find ${_ats_testdir} \"${_ats_IMAGEDIR}\"")
+         message (STATUS "  -> Will not run tests ${_ats_UNPARSED_ARGUMENTS}")
+         message (STATUS "  -> You can find it at ${_ats_URL}\n")
+     else ()
+diff --git a/testsuite/python-imagebufalgo/ref/out.txt b/testsuite/python-imagebufalgo/ref/out.txt
+index 3611460..599484d 100644
+--- a/testsuite/python-imagebufalgo/ref/out.txt
++++ b/testsuite/python-imagebufalgo/ref/out.txt
+@@ -13,15 +13,15 @@ Stats for tahoe-small.tif:
+   max         =  [0.8784314393997192, 1.0, 1.0]
+   avg         =  [0.10193096846342087, 0.21669696271419525, 0.4254732131958008]
+   stddev      =  [0.13176830112934113, 0.23792722821235657, 0.3826749324798584]
+-  nancount    =  [0L, 0L, 0L]
+-  infcount    =  [0L, 0L, 0L]
+-  finitecount =  [196608L, 196608L, 196608L]
++  nancount    =  [0, 0, 0]
++  infcount    =  [0, 0, 0]
++  finitecount =  [196608, 196608, 196608]
+ Comparison: of flip.tif and flop.tif
+   mean = 0.0068759
+   rms  = 0.051175
+   PSNR = 25.819
+   max  = 0.45098
+-  max @ (214L, 88L, 0L, 0L)
++  max @ (214, 88, 0, 0)
+   warns 2034 fails 2034
+ Relative comparison: of flip.tif and flop.tif
+   warns 1946 fails 1896
+@@ -29,12 +29,12 @@ isConstantColor on pink image is (1 0.50196 0.50196)
+ isConstantColor on checker is  None
+ Is cmul1.exr monochrome?  True
+ Is cmul2.exr monochrome?  False
+-color range counts =  (4L, 8L, 4L)
++color range counts =  (4, 8, 4)
+ Nonzero region is:  100 180 100 180 0 1 0 3
+-SHA-1 of bsplinekernel.exr is: D5826B66A5313F9A32D42C5CF49C90EC4E7F84BF
+-R hist:  (10000L, 0L, 0L, 0L)
+-G hist:  (10000L, 0L, 0L, 0L)
+-B hist:  (0L, 10000L, 0L, 0L)
++SHA-1 of bsplinekernel.exr is: 0902C72521944A879D5F8E8154B6DFA9D3F62598
++R hist:  (10000, 0, 0, 0)
++G hist:  (10000, 0, 0, 0)
++B hist:  (0, 10000, 0, 0)
+ Done.
+ Comparing "black.tif" and "ref/black.tif"
+ PASS
+@@ -64,8 +64,6 @@ Comparing "flat.exr" and "../../../testsuite/oiiotool-deep/ref/flat.exr"
+ PASS
+ Comparing "deepen.exr" and "../../../testsuite/oiiotool-deep/ref/deepen.exr"
+ PASS
+-Comparing "crop.tif" and "../../../testsuite/oiiotool-copy/ref/crop.tif"
+-PASS
+ Comparing "cut.tif" and "../../../testsuite/oiiotool-copy/ref/cut.tif"
+ PASS
+ Comparing "pasted.tif" and "../../../testsuite/oiiotool-copy/ref/pasted.tif"
+diff --git a/testsuite/tiff-depths/ref/out.txt b/testsuite/tiff-depths/ref/out.txt
+index dfa3ad6..4acd0ec 100644
+--- a/testsuite/tiff-depths/ref/out.txt
++++ b/testsuite/tiff-depths/ref/out.txt
+@@ -799,7 +799,7 @@ flower-separated-contig-08.tif :   73 x   43, 3 channel, uint8 tiff
+     SHA-1: F739D368D37AB99D237FA1358A2EECE913245226
+ Reading ../oiio-images/libtiffpic/depth/flower-separated-contig-16.tif
+ ../oiio-images/libtiffpic/depth/flower-separated-contig-16.tif :   73 x   43, 3 channel, uint16 tiff
+-    SHA-1: A5C53C7628B01F12DCAE09A42D8B15433644C54C
++    SHA-1: 5960EB6AB475E0FDB517736F65DF47F6D89F04CB
+     channel list: R, G, B
+     compression: "none"
+     DocumentName: "flower-separated-contig-16.tif"
+@@ -821,7 +821,7 @@ PASS
+ flower-separated-contig-16.tif :   73 x   43, 3 channel, uint8 tiff
+     SHA-1: E55335D12E9A20EFB0A5EAE80F1801DF5A9BEE12
+ ../oiio-images/libtiffpic/depth/flower-separated-contig-16.tif :   73 x   43, 3 channel, uint16 tiff
+-    SHA-1: A5C53C7628B01F12DCAE09A42D8B15433644C54C
++    SHA-1: 5960EB6AB475E0FDB517736F65DF47F6D89F04CB
+ Reading ../oiio-images/libtiffpic/depth/flower-separated-planar-08.tif
+ ../oiio-images/libtiffpic/depth/flower-separated-planar-08.tif :   73 x   43, 3 channel, uint8 tiff
+     SHA-1: F739D368D37AB99D237FA1358A2EECE913245226
+@@ -849,7 +849,7 @@ flower-separated-planar-08.tif :   73 x   43, 3 channel, uint8 tiff
+     SHA-1: F739D368D37AB99D237FA1358A2EECE913245226
+ Reading ../oiio-images/libtiffpic/depth/flower-separated-planar-16.tif
+ ../oiio-images/libtiffpic/depth/flower-separated-planar-16.tif :   73 x   43, 3 channel, uint16 tiff
+-    SHA-1: A5C53C7628B01F12DCAE09A42D8B15433644C54C
++    SHA-1: 5960EB6AB475E0FDB517736F65DF47F6D89F04CB
+     channel list: R, G, B
+     compression: "none"
+     DocumentName: "flower-separated-planar-16.tif"
+@@ -871,6 +871,6 @@ PASS
+ flower-separated-planar-16.tif :   73 x   43, 3 channel, uint8 tiff
+     SHA-1: E55335D12E9A20EFB0A5EAE80F1801DF5A9BEE12
+ ../oiio-images/libtiffpic/depth/flower-separated-planar-16.tif :   73 x   43, 3 channel, uint16 tiff
+-    SHA-1: A5C53C7628B01F12DCAE09A42D8B15433644C54C
++    SHA-1: 5960EB6AB475E0FDB517736F65DF47F6D89F04CB
+ Comparing "cmyk_as_cmyk.tif" and "ref/cmyk_as_cmyk.tif"
+ PASS

diff --git a/media-libs/openimageio/files/openimageio-2.5.8.0-fix-unit_simd.patch b/media-libs/openimageio/files/openimageio-2.5.8.0-fix-unit_simd.patch
new file mode 100644
index 000000000000..b43d96ce959b
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.8.0-fix-unit_simd.patch
@@ -0,0 +1,18 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make simd tests use a threshold for floating point equality check
+
+diff --git a/src/libutil/simd_test.cpp b/src/libutil/simd_test.cpp
+index 4ecee70..0c15d81 100644
+--- a/src/libutil/simd_test.cpp
++++ b/src/libutil/simd_test.cpp
+@@ -1611,8 +1611,8 @@ void test_mathfuncs ()
+     VEC expA = mkvec<VEC> (0.367879441171442f, 1.0f, 2.718281828459045f, 90.0171313005218f);
+     OIIO_CHECK_SIMD_EQUAL (exp(A), expA);
+     OIIO_CHECK_SIMD_EQUAL_THRESH (log(expA), A, 1e-6f);
+-    OIIO_CHECK_SIMD_EQUAL (fast_exp(A),
+-                mkvec<VEC>(fast_exp(A[0]), fast_exp(A[1]), fast_exp(A[2]), fast_exp(A[3])));
++    OIIO_CHECK_SIMD_EQUAL_THRESH (fast_exp(A),
++                mkvec<VEC>(fast_exp(A[0]), fast_exp(A[1]), fast_exp(A[2]), fast_exp(A[3])), 1e-7f);
+     OIIO_CHECK_SIMD_EQUAL_THRESH (fast_log(expA),
+                 mkvec<VEC>(fast_log(expA[0]), fast_log(expA[1]), fast_log(expA[2]), fast_log(expA[3])), 0.00001f);
+     OIIO_CHECK_SIMD_EQUAL_THRESH (fast_pow_pos(VEC(2.0f), A),

diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 3d6c024315eb..626c08235ddd 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
+		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="gui">Build iv (with Qt5)</flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>

diff --git a/media-libs/openimageio/openimageio-2.5.9.0.ebuild b/media-libs/openimageio/openimageio-2.5.9.0.ebuild
new file mode 100644
index 000000000000..f0f6accc867e
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.5.9.0.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
+TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
+inherit cmake flag-o-matic font python-single-r1 virtualx
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+		fits? (
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+		)
+	)
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools )"
+
+# Not quite working yet
+RESTRICT="!test? ( test )" # test"
+
+BDEPEND="
+	jpeg2k? ( app-arch/unzip )
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.13.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	fits? ( sci-libs/cfitsio:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	gui? (
+		media-libs/libglvnd
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets,opengl]
+		)
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	CHANGES.md
+	CREDITS.md
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.8.0-fits.patch"
+	"${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
+	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use dicom; then
+		rm -r "${S}/src/dicom.imageio/" || die
+	fi
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+		mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+		if use jpeg2k; then
+			mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+		fi
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD="17"
+		-DDOWNSTREAM_CXX_STANDARD="17"
+
+		-DCMAKE_UNITY_BUILD_MODE="BATCH"
+		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+		-DOIIO_BUILD_TOOLS="$(usex tools)"
+		-DOIIO_BUILD_TESTS="$(usex test)"
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA="OFF"
+
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+
+		-DINSTALL_FONTS="OFF"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DSTOP_ON_WARNING="OFF"
+		-DUSE_CCACHE="OFF"
+
+		-DUSE_EXTERNAL_PUGIXML="ON"
+
+		-DENABLE_DCMTK="$(usex dicom)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_NUKE="OFF" # not in Gentoo
+		-DENABLE_OPENJPEG="$(usex jpeg2k)"
+		-DENABLE_OPENCV="$(usex opencv)"
+		-DENABLE_OPENVDB="$(usex openvdb)"
+		-DENABLE_PTEX="$(usex ptex)"
+		-DUSE_PYTHON="$(usex python)"
+		-DENABLE_LIBRAW="$(usex raw)"
+		-DENABLE_FREETYPE="$(usex truetype)"
+
+		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+
+		-DVERBOSE="yes"
+		-DENABLE_FITS="$(usex fits)"
+
+	)
+
+	if use gui; then
+		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
+		if ! use qt6; then
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
+		fi
+	else
+		mycmakeargs+=(
+			# -DENABLE_IV=OFF
+			-DUSE_QT=OFF
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+	)
+
+	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+	CI=true
+	CMAKE_PREFIX_PATH="${T}/usr"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+	if use python; then
+		PYTHONPATH="${T}$(python_get_sitedir)"
+	fi
+
+	virtx cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+	# NOTE both eclasses export src_install so we ran both by hand.
+	font_src_install
+	cmake_src_install
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2024-06-05 12:57 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2024-06-05 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e66d96d5e7d63c30fa893ed0f4fecb1cf0ca8c4f
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Jun  3 13:47:00 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 12:56:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66d96d5

media-libs/openimageio: add 2.5.12.0

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |   2 +
 .../openimageio-2.5.12.0-tests-optional.patch      |  31 +++
 .../files/openimageio-2.5.12.0_heif_test.patch     |  18 ++
 media-libs/openimageio/openimageio-2.5.12.0.ebuild | 302 +++++++++++++++++++++
 4 files changed, 353 insertions(+)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index f312d364a6d0..3985bbc6f21c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -10,12 +10,14 @@ DIST openimageio-2.4.14.0.tar.gz 47890469 BLAKE2B 53865ab493a586a1e4fdc6f81a90f7
 DIST openimageio-2.4.15.0.tar.gz 47894262 BLAKE2B 82afc48b3d9affb987d94c57d91fe93b27c78350d02fc7605ce3995e5f37724495bbc0d2f85fa8efb86113ef48d0aec15cfdb9bad8547315542ed125e5f71349 SHA512 dc1f805d6dc85170784d2b2860bfd488fdebb92cb12254d5c0d4df9483e55f298f6fbf74aca0c52162583300327de99bd92f73c2a2b7f5611f61bbfef5ca22a5
 DIST openimageio-2.4.16.0.tar.gz 47894563 BLAKE2B 02788bb7ccc9bbcb84a44df0c86252545f89cf8dcd1b84443f185f43e60c9eb701e9c5e781c946dec797ec888c5ebdd5efb3f1d95b684c71cbb7271bf6f0da9e SHA512 f9835d6b5e938bdba462a64eb9cc3b89f27ea36b6b59f7143a9c0b2794f095ca68fbd26bdd7322b2b260e9ded5cc6a91f86ad11f292ad8163a1dfe55b9a3446c
 DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5
+DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4
 DIST openimageio-2.5.4.0.tar.gz 48107518 BLAKE2B 38ba0f01976cfbe0f81c04fe8e64ff9c5ab530204d45a7b566882a7ec31c378c61a9b6bc62d6453c51e7ed33cd514a758b5d8224a646e568c9abd6274ebc6b0c SHA512 db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd
 DIST openimageio-2.5.5.0.tar.gz 52025462 BLAKE2B d8d88d5e89815525fe7e75983b8d373058901614dcea9743a3851e242aa5f076b81ef3cc18764063e456ed9b79758d146c5d862be3a45d3671c59c7195acfa51 SHA512 d8ac989a6c7007089e3a29723889c9b9644d23ca9da1606da9f8c6bd7c0b301cf6a03f57c8eaaaca2a2fb2f3e79291f9dfa46ed31240a15d4650b83bf93ce96d
 DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6
+DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59
 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521
 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
 DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4

diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch
new file mode 100644
index 000000000000..5b284baa281b
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch
@@ -0,0 +1,31 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make fits test images download optional
+Make j2k test images download optional
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index b671def..ff84b7d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -271,9 +271,11 @@ macro (oiio_add_all_tests)
+                     IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+     oiio_add_tests (jpeg2000
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+     oiio_add_tests (jpeg2000-j2kp4files
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR j2kp4files_v1_5
+                     URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+     set (all_openexr_tests
+@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
+     oiio_get_test_data (openexr-images
+                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
+                         BRANCH main)
++    if(ENABLE_FITS)
+     oiio_get_test_data (fits-images)
++    endif()
++    if(ENABLE_OPENJPEG)
+     oiio_get_test_data (j2kp4files_v1_5)
++    endif()
+ endfunction ()

diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch
new file mode 100644
index 000000000000..b7543e1e9562
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch
@@ -0,0 +1,18 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: 2024-06-03
+Subject: [PATCH] create a ref output for libheif1.15
+
+--- a/testsuite/heif/ref/out-libheif1.15-orient.txt	2024-06-01 21:59:05.000000000 +0200
++++ b/testsuite/heif/ref/out-libheif1.15-orient.txt	2024-06-02 17:36:18.069440905 +0200
+@@ -39,6 +39,11 @@
+     Exif:SubsecTimeOriginal: "006"
+     Exif:WhiteBalance: 0 (auto)
+     oiio:ColorSpace: "sRGB"
++Reading ref/Chimera-AV1-8bit-162.avif
++ref/Chimera-AV1-8bit-162.avif :  480 x  270, 3 channel, uint8 heif
++    SHA-1: F8FDAF1BD56A21E3AF99CF8EE7FA45434D2826C7
++    channel list: R, G, B
++    oiio:ColorSpace: "sRGB"
+ Reading ../oiio-images/heif/greyhounds-looking-for-a-table.heic
+ ../oiio-images/heif/greyhounds-looking-for-a-table.heic : 3024 x 4032, 3 channel, uint8 heif
+     SHA-1: 8211F56BBABDC7615CCAF67CBF49741D1A292D2E

diff --git a/media-libs/openimageio/openimageio-2.5.12.0.ebuild b/media-libs/openimageio/openimageio-2.5.12.0.ebuild
new file mode 100644
index 000000000000..c778a756041e
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.5.12.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70"
+TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
+inherit cmake flag-o-matic python-single-r1 virtualx
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+		fits? (
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+		)
+	)
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	jpeg2k? ( app-arch/unzip )
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.13.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	fits? ( sci-libs/cfitsio:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	gui? (
+		media-libs/libglvnd
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets,opengl]
+		)
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	CHANGES.md
+	CREDITS.md
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
+	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use dicom; then
+		rm "src/dicom.imageio" -r || die
+	fi
+
+	if ! use gif; then
+		rm src/gif.imageio -r || die
+	fi
+
+	if ! use jpeg2k; then
+		rm src/jpeg2000.imageio -r || die
+	fi
+
+	if ! use raw; then
+		rm src/raw.imageio -r || die
+	fi
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+		mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+
+		if use fits; then
+			mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
+			for a in ${A}; do
+				if [[ "${a}" == file*.fits ]]; then
+					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
+				fi
+				if [[ "${a}" == tst*.fits ]]; then
+					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
+				fi
+			done
+		fi
+
+		if use jpeg2k; then
+			mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+		fi
+
+		cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
+		eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local mycmakeargs=(
+		-DVERBOSE="yes"
+		-DINTERNALIZE_FMT="no"
+		# -DALWAYS_PREFER_CONFIG="yes"
+		# -DGLIBCXX_USE_CXX11_ABI="yes"
+		# -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
+		-DSTOP_ON_WARNING="OFF"
+
+		-DCMAKE_CXX_STANDARD="17"
+		-DDOWNSTREAM_CXX_STANDARD="17"
+
+		-DCMAKE_UNITY_BUILD_MODE="BATCH"
+		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+		-DBUILD_DOCS="$(usex doc)"
+		# -DBUILD_OIIOUTIL_ONLY="no"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DINSTALL_FONTS="OFF"
+		-DINSTALL_DOCS="$(usex doc)"
+
+		-DENABLE_DCMTK="$(usex dicom)"
+		-DENABLE_FFmpeg="$(usex ffmpeg)"
+		-DENABLE_FITS="$(usex fits)"
+		-DENABLE_FREETYPE="$(usex truetype)"
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LibRaw="$(usex raw)"
+		-DENABLE_Nuke="no" # not in Gentoo
+		-DENABLE_OpenCV="$(usex opencv)"
+		-DENABLE_OpenJPEG="$(usex jpeg2k)"
+		-DENABLE_OpenVDB="$(usex openvdb)"
+		-DENABLE_TBB="$(usex openvdb)"
+		-DENABLE_Ptex="$(usex ptex)"
+
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LIBRAW="$(usex raw)"
+		-DENABLE_PTEX="$(usex ptex)"
+		-DENABLE_OPENJPEG="$(usex jpeg2k)"
+
+		-DOIIO_BUILD_TOOLS="$(usex tools)"
+		-DOIIO_BUILD_TESTS="$(usex test)"
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
+
+		-DUSE_CCACHE="no"
+		-DUSE_EXTERNAL_PUGIXML="yes"
+		# -DUSE_LIBCPLUSPLUS="yes"
+		-DUSE_R3DSDK="no" # not in Gentoo
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+)
+
+	if use gui; then
+		mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" )
+		if ! use qt6; then
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
+		fi
+	else
+		mycmakeargs+=(
+			-DUSE_QT="no"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+	)
+
+	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+	CI=true
+	CMAKE_PREFIX_PATH="${T}/usr"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+	if use python; then
+		PYTHONPATH="${T}$(python_get_sitedir)"
+	fi
+
+	virtx cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove Windows loader file
+	if use python; then
+		rm "${D}$(python_get_sitedir)/__init__.py" || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2024-10-04 21:40 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b65ed0e71677a2de5d15b0b1b1ed1f6c843d0e77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 17:44:36 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 21:40:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65ed0e7

media-libs/openimageio: drop 2.5.9.0, 2.5.12.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |   3 -
 .../files/openimageio-2.5.8.0-fits.patch           |  19 --
 media-libs/openimageio/openimageio-2.5.12.0.ebuild | 303 ---------------------
 media-libs/openimageio/openimageio-2.5.9.0.ebuild  | 263 ------------------
 4 files changed, 588 deletions(-)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index f1e806c27c42..e75ca4b50a4c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -4,12 +4,9 @@ DIST file002.fits 11520 BLAKE2B e1983941ca932f9db088f2d1856ca3b1fd268cf8d30e1885
 DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c041a1e1ef7ad9846a711fafb71ba71b191a7dc44cd94ae7172640210a5c48e2910d34efea4c20989e1 SHA512 dc143b27f8850e2a55ad95a9a7a76a348f0b9b0af5a223d1ae11157eb358acf74e482957faaa0cdbaf260b9cbe14b10e6b504068c7b312f059119c022279611f
 DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8
 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a
-DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4
 DIST openimageio-2.5.13.1.tar.gz 52538869 BLAKE2B ceba0bde73cbf2b5b7b243fa1dc4806aece881c37775418c3305d5e5665e1c249219cad2c7b0d9d4acd5955897dc13dfb94e4627e9ae866e6400559b99e7021a SHA512 3c9eb9a361464e73fae518b704438bbf409c846031f05026d8b9ace91431819ac80674130ccd2300deb9756ae26e150bf5c0a866be3f3fb65bdfba0ba60395ab
-DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59
-DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521
 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
 DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4
 DIST tst0005.fits 48960 BLAKE2B ef8bb62702f579c8500721835100e150b2ca73272866a88457589d6f14b407efb41d106be2d454089dae00c04b903bb874132d5b44852245e6d4372ed20c7b6f SHA512 515a4dbca51e5b7fa0139b369066c02fcfa96eeffb471c6f5073343ab50da527ee610d9b677e6fabdaad1b7f9f9c68bd65eb71c5b944e5ffacf429d01fe14a39

diff --git a/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch b/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch
deleted file mode 100644
index 1ef05f817202..000000000000
--- a/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Make fits test images download optional
-Make j2k test images download optional
-
-diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
-index b671def..ff84b7d 100644
---- a/src/cmake/testing.cmake
-+++ b/src/cmake/testing.cmake
-@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
-     oiio_get_test_data (openexr-images
-                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
-                         BRANCH main)
-+    if(ENABLE_FITS)
-     oiio_get_test_data (fits-images)
-+    endif()
-+    if(OPENJPEG_FOUND)
-     oiio_get_test_data (j2kp4files_v1_5)
-+    endif()
- endfunction ()

diff --git a/media-libs/openimageio/openimageio-2.5.12.0.ebuild b/media-libs/openimageio/openimageio-2.5.12.0.ebuild
deleted file mode 100644
index bd837866d719..000000000000
--- a/media-libs/openimageio/openimageio-2.5.12.0.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic python-single-r1 virtualx
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
-
-		fits? (
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
-		)
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	jpeg2k? ( app-arch/unzip )
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	fits? ( sci-libs/cfitsio:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
-	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch"
-	"${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use dicom; then
-		rm "src/dicom.imageio" -r || die
-	fi
-
-	if ! use gif; then
-		rm src/gif.imageio -r || die
-	fi
-
-	if ! use jpeg2k; then
-		rm src/jpeg2000.imageio -r || die
-	fi
-
-	if ! use raw; then
-		rm src/raw.imageio -r || die
-	fi
-
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
-		mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
-
-		if use fits; then
-			mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
-			for a in ${A}; do
-				if [[ "${a}" == file*.fits ]]; then
-					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
-				fi
-				if [[ "${a}" == tst*.fits ]]; then
-					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
-				fi
-			done
-		fi
-
-		if use jpeg2k; then
-			mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
-		fi
-
-		cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
-		eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		-DVERBOSE="yes"
-		-DINTERNALIZE_FMT="no"
-		# -DALWAYS_PREFER_CONFIG="yes"
-		# -DGLIBCXX_USE_CXX11_ABI="yes"
-		# -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
-		-DSTOP_ON_WARNING="OFF"
-
-		-DCMAKE_CXX_STANDARD="17"
-		-DDOWNSTREAM_CXX_STANDARD="17"
-
-		-DCMAKE_UNITY_BUILD_MODE="BATCH"
-		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
-
-		-DBUILD_DOCS="$(usex doc)"
-		# -DBUILD_OIIOUTIL_ONLY="no"
-		-DBUILD_TESTING="$(usex test)"
-
-		-DINSTALL_FONTS="OFF"
-		-DINSTALL_DOCS="$(usex doc)"
-
-		-DENABLE_DCMTK="$(usex dicom)"
-		-DENABLE_FFmpeg="$(usex ffmpeg)"
-		-DENABLE_FITS="$(usex fits)"
-		-DENABLE_FREETYPE="$(usex truetype)"
-		-DENABLE_GIF="$(usex gif)"
-		-DENABLE_LibRaw="$(usex raw)"
-		-DENABLE_Nuke="no" # not in Gentoo
-		-DENABLE_OpenCV="$(usex opencv)"
-		-DENABLE_OpenJPEG="$(usex jpeg2k)"
-		-DENABLE_OpenVDB="$(usex openvdb)"
-		-DENABLE_TBB="$(usex openvdb)"
-		-DENABLE_Ptex="$(usex ptex)"
-
-		-DENABLE_GIF="$(usex gif)"
-		-DENABLE_LIBRAW="$(usex raw)"
-		-DENABLE_PTEX="$(usex ptex)"
-		-DENABLE_OPENJPEG="$(usex jpeg2k)"
-
-		-DOIIO_BUILD_TOOLS="$(usex tools)"
-		-DOIIO_BUILD_TESTS="$(usex test)"
-		-DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
-
-		-DUSE_CCACHE="no"
-		-DUSE_EXTERNAL_PUGIXML="yes"
-		# -DUSE_LIBCPLUSPLUS="yes"
-		-DUSE_R3DSDK="no" # not in Gentoo
-		-DUSE_PYTHON="$(usex python)"
-		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
-)
-
-	if use gui; then
-		mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=(
-			-DUSE_QT="no"
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# A lot of tests needs to have access to the installed data files.
-	# So install them into the image directory now.
-	DESTDIR="${T}" cmake_build install
-
-	CMAKE_SKIP_TESTS=(
-		"-broken$"
-	)
-
-	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
-		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
-
-	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
-	CI=true
-	CMAKE_PREFIX_PATH="${T}/usr"
-	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
-	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
-
-	if use python; then
-		PYTHONPATH="${T}$(python_get_sitedir)"
-	fi
-
-	virtx cmake_src_test
-
-	# Clean up the image directory for src_install
-	rm -fr "${T:?}"/usr || die
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove Windows loader file
-	if use python; then
-		rm "${D}$(python_get_sitedir)/__init__.py" || die
-	fi
-}

diff --git a/media-libs/openimageio/openimageio-2.5.9.0.ebuild b/media-libs/openimageio/openimageio-2.5.9.0.ebuild
deleted file mode 100644
index 358d16e63a03..000000000000
--- a/media-libs/openimageio/openimageio-2.5.9.0.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1 virtualx
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
-
-		fits? (
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
-			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
-			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
-		)
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	jpeg2k? ( app-arch/unzip )
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	fits? ( sci-libs/cfitsio:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.8.0-fits.patch"
-	"${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
-	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use dicom; then
-		rm -r "${S}/src/dicom.imageio/" || die
-	fi
-
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
-		mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
-		if use jpeg2k; then
-			mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
-		fi
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD="17"
-		-DDOWNSTREAM_CXX_STANDARD="17"
-
-		-DCMAKE_UNITY_BUILD_MODE="BATCH"
-		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
-
-		-DOIIO_BUILD_TOOLS="$(usex tools)"
-		-DOIIO_BUILD_TESTS="$(usex test)"
-		-DOIIO_DOWNLOAD_MISSING_TESTDATA="OFF"
-
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOCS="$(usex doc)"
-
-		-DINSTALL_FONTS="OFF"
-		-DINSTALL_DOCS="$(usex doc)"
-		-DSTOP_ON_WARNING="OFF"
-		-DUSE_CCACHE="OFF"
-
-		-DUSE_EXTERNAL_PUGIXML="ON"
-
-		-DENABLE_DCMTK="$(usex dicom)"
-		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_GIF="$(usex gif)"
-		-DENABLE_NUKE="OFF" # not in Gentoo
-		-DENABLE_OPENJPEG="$(usex jpeg2k)"
-		-DENABLE_OPENCV="$(usex opencv)"
-		-DENABLE_OPENVDB="$(usex openvdb)"
-		-DENABLE_PTEX="$(usex ptex)"
-		-DUSE_PYTHON="$(usex python)"
-		-DENABLE_LIBRAW="$(usex raw)"
-		-DENABLE_FREETYPE="$(usex truetype)"
-
-		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
-
-		-DVERBOSE="yes"
-		-DENABLE_FITS="$(usex fits)"
-
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=(
-			# -DENABLE_IV=OFF
-			-DUSE_QT=OFF
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# A lot of tests needs to have access to the installed data files.
-	# So install them into the image directory now.
-	DESTDIR="${T}" cmake_build install
-
-	CMAKE_SKIP_TESTS=(
-		"-broken$"
-	)
-
-	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
-		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
-
-	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
-	CI=true
-	CMAKE_PREFIX_PATH="${T}/usr"
-	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
-	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
-
-	if use python; then
-		PYTHONPATH="${T}$(python_get_sitedir)"
-	fi
-
-	virtx cmake_src_test
-
-	# Clean up the image directory for src_install
-	rm -fr "${T:?}"/usr || die
-}
-
-src_install() {
-	# NOTE both eclasses export src_install so we ran both by hand.
-	font_src_install
-	cmake_src_install
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
@ 2025-01-05 20:35 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-01-05 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     fa90c53710c45618987773803fda61b5af39e2bc
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 19:17:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 20:33:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa90c537

media-libs/openimageio: add 2.5.18.0

Bug: https://bugs.gentoo.org/937887
Closes: https://bugs.gentoo.org/940297
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |   3 +
 .../openimageio-2.5.18.0-tests-optional.patch      |  31 +++
 media-libs/openimageio/openimageio-2.5.18.0.ebuild | 302 +++++++++++++++++++++
 3 files changed, 336 insertions(+)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index e75ca4b50a4c..1d817bd5b805 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -5,8 +5,11 @@ DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c0
 DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8
 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a
 DIST openimageio-2.5.13.1.tar.gz 52538869 BLAKE2B ceba0bde73cbf2b5b7b243fa1dc4806aece881c37775418c3305d5e5665e1c249219cad2c7b0d9d4acd5955897dc13dfb94e4627e9ae866e6400559b99e7021a SHA512 3c9eb9a361464e73fae518b704438bbf409c846031f05026d8b9ace91431819ac80674130ccd2300deb9756ae26e150bf5c0a866be3f3fb65bdfba0ba60395ab
+DIST openimageio-2.5.18.0.tar.gz 52549475 BLAKE2B 8a3f61f6089b304202e829a28946ec8c0bc84e05e61b84dd39f1e036614faab005619962c0217248208e133595f55fa8ffea1d931710a88eff8208b8c36fa2ae SHA512 ab6ef20fe099c19ec8cce1308890e76ec82c4bcdc1d5a2ead8c44f04593c060e819fededb958b7f36ccd0118b1aae9b1c5e12b442f7e066e940b4e32d378f7d9
+DIST openimageio-oexr-test-image-d45a2d5a890d6963b94479c7a644440068c37dd2.tar.gz 263237088 BLAKE2B 9445464b6d75d4800b843bd4a4f88404f587ca4ed384a0c1d428d5a249c04af0c610a95660aac5edff22c003c067e3a907d4a0896d7cfb20731cb486e436f17d SHA512 bbfd8e40eedd26955bc97789bfdfd556ee9ed652babc1c9c60c3cda6e5cab05a0a813323f25bc536132498a2bf3185a07020cd1170c047b72973e2be3e10fe19
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59
+DIST openimageio-oiio-test-image-7e6d875542b5bc1b2974b7cbecee115365a36527.tar.gz 143496336 BLAKE2B b08d42834f60abd14a64b442e30ec4f80f4bb8095177ffd1ba94240a4c9a3947cdd36f98cd967667e8a5d52fe490a214ad4cd58a836a4acd39bbe1a744eacb8b SHA512 f4f0612b4b3600fbb1ef30b4f196139a300f36e6a8290ee6a49fe0fa86072e2becf3d9e5f32c060b2ed04c0946848976bead62b352996fb8286f9969daf764d1
 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
 DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4
 DIST tst0005.fits 48960 BLAKE2B ef8bb62702f579c8500721835100e150b2ca73272866a88457589d6f14b407efb41d106be2d454089dae00c04b903bb874132d5b44852245e6d4372ed20c7b6f SHA512 515a4dbca51e5b7fa0139b369066c02fcfa96eeffb471c6f5073343ab50da527ee610d9b677e6fabdaad1b7f9f9c68bd65eb71c5b944e5ffacf429d01fe14a39

diff --git a/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch b/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch
new file mode 100644
index 000000000000..e9fb9a4b1911
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch
@@ -0,0 +1,31 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make fits test images download optional
+Make j2k test images download optional
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index b671def..ff84b7d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -271,9 +271,11 @@ macro (oiio_add_all_tests)
+                     IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
+     oiio_add_tests (jpeg2000
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
+     oiio_add_tests (jpeg2000-j2kp4files
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR j2kp4files_v1_5
+                     URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+     set (all_openexr_tests
+@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
+     oiio_get_test_data (openexr-images
+                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
+                         BRANCH main)
++    if(ENABLE_FITS)
+     oiio_get_test_data (fits-images)
++    endif()
++    if(ENABLE_OPENJPEG)
+     oiio_get_test_data (j2kp4files_v1_5)
++    endif()
+ endfunction ()

diff --git a/media-libs/openimageio/openimageio-2.5.18.0.ebuild b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
new file mode 100644
index 000000000000..a036d8cbe26c
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+TEST_OIIO_IMAGE_COMMIT="7e6d875542b5bc1b2974b7cbecee115365a36527"
+TEST_OEXR_IMAGE_COMMIT="d45a2d5a890d6963b94479c7a644440068c37dd2"
+inherit cmake flag-o-matic python-single-r1 virtualx
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+		fits? (
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+		)
+	)
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	jpeg2k? ( app-arch/unzip )
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.13.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	fits? ( sci-libs/cfitsio:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	gui? (
+		media-libs/libglvnd
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	CHANGES.md
+	CREDITS.md
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch"
+	"${FILESDIR}/${PN}-2.5.18.0-tests-optional.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use dicom; then
+		rm "src/dicom.imageio" -r || die
+	fi
+
+	if ! use gif; then
+		rm src/gif.imageio -r || die
+	fi
+
+	if ! use jpeg2k; then
+		rm src/jpeg2000.imageio -r || die
+	fi
+
+	if ! use raw; then
+		rm src/raw.imageio -r || die
+	fi
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		ln -s "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+		ln -s "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+
+		if use fits; then
+			mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
+			for a in ${A}; do
+				if [[ "${a}" == file*.fits ]]; then
+					ln -s "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
+				fi
+				if [[ "${a}" == tst*.fits ]]; then
+					ln -s "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
+				fi
+			done
+		fi
+
+		if use jpeg2k; then
+			ln -s "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+		fi
+
+		cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
+		eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118077
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 15 ]]; then
+		append-flags -fno-early-inlining
+	fi
+
+	local mycmakeargs=(
+		-DVERBOSE="yes"
+		-DINTERNALIZE_FMT="no"
+		# -DALWAYS_PREFER_CONFIG="yes"
+		# -DGLIBCXX_USE_CXX11_ABI="yes"
+		# -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
+		-DSTOP_ON_WARNING="OFF"
+
+		-DCMAKE_CXX_STANDARD="17"
+		-DDOWNSTREAM_CXX_STANDARD="17"
+
+		-DCMAKE_UNITY_BUILD_MODE="BATCH"
+		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+		-DBUILD_DOCS="$(usex doc)"
+		# -DBUILD_OIIOUTIL_ONLY="no"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DINSTALL_FONTS="OFF"
+		-DINSTALL_DOCS="$(usex doc)"
+
+		-DENABLE_DCMTK="$(usex dicom)"
+		-DENABLE_FFmpeg="$(usex ffmpeg)"
+		-DENABLE_FITS="$(usex fits)"
+		-DENABLE_FREETYPE="$(usex truetype)"
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LibRaw="$(usex raw)"
+		-DENABLE_Nuke="no" # not in Gentoo
+		-DENABLE_OpenCV="$(usex opencv)"
+		-DENABLE_OpenJPEG="$(usex jpeg2k)"
+		-DENABLE_OpenVDB="$(usex openvdb)"
+		-DENABLE_TBB="$(usex openvdb)"
+		-DENABLE_Ptex="$(usex ptex)"
+
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LIBRAW="$(usex raw)"
+		-DENABLE_PTEX="$(usex ptex)"
+		-DENABLE_OPENJPEG="$(usex jpeg2k)"
+
+		-DOIIO_BUILD_TOOLS="$(usex tools)"
+		-DOIIO_BUILD_TESTS="$(usex test)"
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
+
+		-DUSE_CCACHE="no"
+		-DUSE_EXTERNAL_PUGIXML="yes"
+		# -DUSE_LIBCPLUSPLUS="yes"
+		-DUSE_R3DSDK="no" # not in Gentoo
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+)
+
+	if use gui; then
+		mycmakeargs+=(
+			-DUSE_IV="yes"
+			-DUSE_OPENGL="yes"
+			-DUSE_QT="yes"
+		)
+	else
+		mycmakeargs+=(
+			-DUSE_QT="no"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"texture-levels-stochaniso.batch"
+		"unit_simd"
+	)
+
+	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+	CI=true
+	CMAKE_PREFIX_PATH="${T}/usr"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+	if use python; then
+		PYTHONPATH="${T}$(python_get_sitedir)"
+	fi
+
+	virtx cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove Windows loader file
+	if use python; then
+		rm "${D}$(python_get_sitedir)/__init__.py" || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-01-05 20:35 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-18 16:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-01-05 20:35 Sam James
2024-10-04 21:40 Andreas Sturmlechner
2024-06-05 12:57 Andrew Ammerlaan
2022-02-15 19:51 Sam James
2020-10-08 21:23 Sam James
2019-07-16 15:14 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox