[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/

["Sam James" <sam@gentoo.org>]

commit:     0c916468b0c52c4e8351c9b17cd2277cdff19d1b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 03:53:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:55:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c916468

media-libs/openimageio: add 2.2.19.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openimageio/Manifest                    |  1 +
 ....11.0-r1.ebuild => openimageio-2.2.19.0.ebuild} | 56 +++++++---------------
 .../openimageio/openimageio-2.3.11.0-r1.ebuild     |  2 +-
 media-libs/openimageio/openimageio-2.3.12.0.ebuild |  2 +-
 4 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index e75be6bbbc01..077868982437 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,5 @@
 DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
+DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
 DIST openimageio-2.3.11.0.tar.gz 32439595 BLAKE2B 6e64284c36de87fc077e839db808d4fab0cb6ea4951639cfed21e68900782c03ef6c2e64dcae5c1bf9360ad0a838ee36396d31634ad0ddd20f8fc9f683fc9dc8 SHA512 7e973f4f1b00dfc2486d074f5fdd03aa612a650411c7440868a4846ecfda8b172be33110fce35801dfed92d80f338b989f3ee001191938c48edef5ca760eff3c
 DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f

diff --git a/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
similarity index 67%
copy from media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
copy to media-libs/openimageio/openimageio-2.2.19.0.ebuild
index 445eb5f23ac9..c19e648e4dec 100644
--- a/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
@@ -5,24 +5,15 @@ EAPI=7
 
 FONT_PN=OpenImageIO
 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"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-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
-	)"
-S="${WORKDIR}/oiio-${PV}"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
@@ -31,11 +22,12 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
 
 BDEPEND="
 	doc? (
@@ -52,17 +44,18 @@ RDEPEND="
 	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/imath:=
 	media-libs/opencolorio:=
-	media-libs/openexr:3=
+	>=media-libs/openexr-2.2.0-r2:0=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
 	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
 	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
 	opencv? ( media-libs/opencv:= )
@@ -97,10 +90,6 @@ 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
 }
@@ -111,18 +100,12 @@ src_prepare() {
 	# (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
+	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
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
 }
 
 src_configure() {
@@ -136,12 +119,9 @@ 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)
-		-DOIIO_BUILD_TESTS=$(usex test)
+		-DOIIO_BUILD_TESTS=OFF
 		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
@@ -152,6 +132,7 @@ src_configure() {
 		-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)
@@ -165,10 +146,7 @@ src_configure() {
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
 	fi
 
 	cmake_src_configure

diff --git a/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
index 445eb5f23ac9..f801cdfbc915 100644
--- a/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 	>=media-libs/libheif-1.7.0:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
-	media-libs/imath:=
+	dev-libs/imath:=
 	media-libs/opencolorio:=
 	media-libs/openexr:3=
 	media-libs/tiff:0=

diff --git a/media-libs/openimageio/openimageio-2.3.12.0.ebuild b/media-libs/openimageio/openimageio-2.3.12.0.ebuild
index 445eb5f23ac9..f801cdfbc915 100644
--- a/media-libs/openimageio/openimageio-2.3.12.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.12.0.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 	>=media-libs/libheif-1.7.0:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
-	media-libs/imath:=
+	dev-libs/imath:=
 	media-libs/opencolorio:=
 	media-libs/openexr:3=
 	media-libs/tiff:0=