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

["Florian Schmaus" <flow@gentoo.org>]

commit:     44e968379c2b7b4c6154c184f5f1fea18407a343
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Sun Mar 17 12:55:08 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 14:18:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e96837

media-libs/openexr: replace 3.2.2 with 3.2.3

Release:
  - https://github.com/AcademySoftwareFoundation/openexr/releases/tag/v3.2.3

These changes also:
  - fix/simplify handling of the test USE flag
  - fix handling of the examples USE flag
  - improve handling of the doc USE flag
  - fix the RDEPEND

Closes: https://bugs.gentoo.org/925128
Closes: https://bugs.gentoo.org/925198
Co-authored-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35692
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 media-libs/openexr/Manifest                        |  2 +-
 .../{openexr-3.2.2.ebuild => openexr-3.2.3.ebuild} | 79 ++++++++++++----------
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 56482c59e738..70d169cd8c7b 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -2,5 +2,5 @@ DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
 DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb
-DIST openexr-3.2.2.tar.gz 18825996 BLAKE2B 535d7798263ee63cbb79981bfd5b8edf4805acd672b7f98457876b7017840263bd6f1491dc63afcd3a66751a73fbb8463764c85ba06c18d59839d9f25a6769db SHA512 b6537a8218686bfad7e6d29ae087d0548624cce81308d31581d99b4b741de3223b22fb8748fe9223e4e3609761815bef5e1bcc55e06302aeaf25d9d9a6134bab
+DIST openexr-3.2.3.tar.gz 18855303 BLAKE2B 4f5dbd9033031e988e973ef039b67632ac92e1272cc1d3e4540992f09f6b275c3ecb4c8f690cd98620519993099d132b43bb4bb40bb0d11caa06db868404015a SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6
 DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a

diff --git a/media-libs/openexr/openexr-3.2.2.ebuild b/media-libs/openexr/openexr-3.2.3.ebuild
similarity index 63%
rename from media-libs/openexr/openexr-3.2.2.ebuild
rename to media-libs/openexr/openexr-3.2.3.ebuild
index 84a97d580e9f..29c1e2625355 100644
--- a/media-libs/openexr/openexr-3.2.2.ebuild
+++ b/media-libs/openexr/openexr-3.2.3.ebuild
@@ -25,18 +25,18 @@ SLOT="0/31" # based on SONAME
 KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/libdeflate
+	app-arch/libdeflate[zlib]
 	>=dev-libs/imath-3.1.6:=
-	doc? (
-		sys-apps/help2man
-		dev-python/sphinx-press-theme
-	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
@@ -54,34 +54,32 @@ src_prepare() {
 
 	cmake_src_prepare
 
-	if use test; then
-		if use utils; then
-			IMAGES=(
-				Beachball/multipart.0001.exr
-				Beachball/singlepart.0001.exr
-				Chromaticities/Rec709.exr
-				Chromaticities/Rec709_YC.exr
-				Chromaticities/XYZ.exr
-				Chromaticities/XYZ_YC.exr
-				LuminanceChroma/Flowers.exr
-				LuminanceChroma/Garden.exr
-				MultiResolution/ColorCodedLevels.exr
-				MultiResolution/WavyLinesCube.exr
-				MultiResolution/WavyLinesLatLong.exr
-				MultiView/Adjuster.exr
-				TestImages/GammaChart.exr
-				TestImages/GrayRampsHorizontal.exr
-				v2/LeftView/Balls.exr
-				v2/Stereo/Trunks.exr
-			)
-
-			mkdir -p "${BUILD_DIR}/src/test/bin" || die
-
-			for image in "${IMAGES[@]}"; do
-				mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
-				cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/$(dirname "${image}")/" || die
-			done
-		fi
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
 	fi
 
 }
@@ -98,14 +96,14 @@ src_configure() {
 		-DBUILD_TESTING="$(usex test)"
 		-DBUILD_WEBSITE="no"
 
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
 		-DOPENEXR_BUILD_PYTHON="no"
 		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
 		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
 		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
 
 		-DOPENEXR_INSTALL="yes"
-		-DOPENEXR_INSTALL_DOCS="$(usex doc "$(usex utils)")"
-		-DOPENEXR_INSTALL_EXAMPLES="$(usex examples)"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
 		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
 		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
 
@@ -113,8 +111,15 @@ src_configure() {
 
 		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
 		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
-		-DOPENEXR_RUN_FUZZ_TESTS="$(usex test)" # NOTE expensive
 	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
 
 	cmake_src_configure
 }