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

[Sam James]

commit:     ef7884410b54b7c9d64de39095a60c8f27a3f0cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 20:50:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 20:50:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef788441

media-libs/openimageio: avoid finding OpenEXR 3 for 2.2.{18,19} too

Bug: https://bugs.gentoo.org/816264
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild | 9 +++++++++
 media-libs/openimageio/openimageio-2.2.19.0.ebuild    | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild 
b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
index f22e98fc7b9..0aa03a21997 100644
--- a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
@@ -95,6 +95,15 @@ 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
 }

diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild 
b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
index 5966a9f7ebd..41c76a3bcd1 100644
--- a/media-libs/openimageio/openimageio-2.2.19.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
@@ -95,6 +95,15 @@ 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
 }