Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/
Date: Mon, 01 Nov 2021 12:37:15
Message-Id: 1635770209.1d79435986200507cccba60dd4bcf2cf168f5a0c.sam@gentoo
1 commit: 1d79435986200507cccba60dd4bcf2cf168f5a0c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 1 12:35:54 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 1 12:36:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d794359
7
8 media-libs/openimageio: fix building against OpenEXR 2
9
10 Closes: https://bugs.gentoo.org/821193
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 ...{openimageio-2.3.8.0.ebuild => openimageio-2.3.8.0-r1.ebuild} | 9 +++++++++
14 1 file changed, 9 insertions(+)
15
16 diff --git a/media-libs/openimageio/openimageio-2.3.8.0.ebuild b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
17 similarity index 92%
18 rename from media-libs/openimageio/openimageio-2.3.8.0.ebuild
19 rename to media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
20 index 76bdf3609e2..77b43ff2ec1 100644
21 --- a/media-libs/openimageio/openimageio-2.3.8.0.ebuild
22 +++ b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
23 @@ -103,6 +103,15 @@ pkg_setup() {
24 }
25
26 src_prepare() {
27 + # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
28 + # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
29 + # (because it mix and matches which version it uses; sed this to
30 + # make sure it'll use OpenEXR 3 if it can, but it won't.)
31 + # bug #821193
32 + sed -i \
33 + -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
34 + src/cmake/modules/FindOpenEXR.cmake || die
35 +
36 cmake_src_prepare
37 cmake_comment_add_subdirectory src/fonts