From ef7884410b54b7c9d64de39095a60c8f27a3f0cd Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 4 Nov 2021 20:50:02 +0000 Subject: [PATCH] media-libs/openimageio: avoid finding OpenEXR 3 for 2.2.{18,19} too Bug: https://bugs.gentoo.org/816264 Signed-off-by: Sam James --- 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 f22e98fc7b93e..0aa03a21997af 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 5966a9f7ebd07..41c76a3bcd1a2 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 }