| 1 |
commit: ef7884410b54b7c9d64de39095a60c8f27a3f0cd |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 4 20:50:02 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 4 20:50:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef788441 |
| 7 |
|
| 8 |
media-libs/openimageio: avoid finding OpenEXR 3 for 2.2.{18,19} too |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/816264 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild | 9 +++++++++ |
| 14 |
media-libs/openimageio/openimageio-2.2.19.0.ebuild | 9 +++++++++ |
| 15 |
2 files changed, 18 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild |
| 18 |
index f22e98fc7b9..0aa03a21997 100644 |
| 19 |
--- a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild |
| 20 |
+++ b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild |
| 21 |
@@ -95,6 +95,15 @@ pkg_setup() { |
| 22 |
} |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath! |
| 26 |
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2 |
| 27 |
+ # (because it mix and matches which version it uses; sed this to |
| 28 |
+ # make sure it'll use OpenEXR 3 if it can, but it won't.) |
| 29 |
+ # bug #821193 |
| 30 |
+ sed -i \ |
| 31 |
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ |
| 32 |
+ src/cmake/modules/FindOpenEXR.cmake || die |
| 33 |
+ |
| 34 |
cmake_src_prepare |
| 35 |
cmake_comment_add_subdirectory src/fonts |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild |
| 39 |
index 5966a9f7ebd..41c76a3bcd1 100644 |
| 40 |
--- a/media-libs/openimageio/openimageio-2.2.19.0.ebuild |
| 41 |
+++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild |
| 42 |
@@ -95,6 +95,15 @@ pkg_setup() { |
| 43 |
} |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath! |
| 47 |
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2 |
| 48 |
+ # (because it mix and matches which version it uses; sed this to |
| 49 |
+ # make sure it'll use OpenEXR 3 if it can, but it won't.) |
| 50 |
+ # bug #821193 |
| 51 |
+ sed -i \ |
| 52 |
+ -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ |
| 53 |
+ src/cmake/modules/FindOpenEXR.cmake || die |
| 54 |
+ |
| 55 |
cmake_src_prepare |
| 56 |
cmake_comment_add_subdirectory src/fonts |
| 57 |
} |
Archives