| 1 |
commit: 4a75e3cc1b8326d387b156282e4f9635b4a97197 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 2 04:54:13 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 2 04:54:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a75e3cc |
| 7 |
|
| 8 |
media-libs/osl: try again to force ilmbase |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 +++++++++++++++++++++++ |
| 13 |
media-libs/osl/osl-1.11.16.0-r2.ebuild | 7 ++-- |
| 14 |
2 files changed, 53 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..a8e5c1f23116 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch |
| 21 |
@@ -0,0 +1,49 @@ |
| 22 |
+Force finding OpenEXR / IlmBase instead of imath for now. |
| 23 |
+--- a/src/cmake/modules/FindOpenEXR.cmake |
| 24 |
++++ b/src/cmake/modules/FindOpenEXR.cmake |
| 25 |
+@@ -39,43 +39,10 @@ |
| 26 |
+ # |
| 27 |
+ |
| 28 |
+ # First, try to fine just the right config files |
| 29 |
+-find_package(Imath CONFIG) |
| 30 |
+-if (NOT TARGET Imath::Imath) |
| 31 |
+- # Couldn't find Imath::Imath, maybe it's older and has IlmBase? |
| 32 |
+- find_package(IlmBase CONFIG) |
| 33 |
+-endif () |
| 34 |
++find_package(IlmBase CONFIG) |
| 35 |
+ find_package(OpenEXR CONFIG) |
| 36 |
+ |
| 37 |
+-if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath) |
| 38 |
+- # OpenEXR 3.x if both of these targets are found |
| 39 |
+- set (FOUND_OPENEXR_WITH_CONFIG 1) |
| 40 |
+- if (NOT OpenEXR_FIND_QUIETLY) |
| 41 |
+- message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})") |
| 42 |
+- endif () |
| 43 |
+- |
| 44 |
+- # Mimic old style variables |
| 45 |
+- set (OPENEXR_VERSION ${OpenEXR_VERSION}) |
| 46 |
+- get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) |
| 47 |
+- get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) |
| 48 |
+- get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) |
| 49 |
+- get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) |
| 50 |
+- get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES) |
| 51 |
+- get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES) |
| 52 |
+- set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY}) |
| 53 |
+- set (ILMBASE_FOUND true) |
| 54 |
+- |
| 55 |
+- get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES) |
| 56 |
+- get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES) |
| 57 |
+- set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES}) |
| 58 |
+- set (OPENEXR_FOUND true) |
| 59 |
+- |
| 60 |
+- # Link with pthreads if required |
| 61 |
+- find_package (Threads) |
| 62 |
+- if (CMAKE_USE_PTHREADS_INIT) |
| 63 |
+- list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) |
| 64 |
+- endif () |
| 65 |
+- |
| 66 |
+-elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND |
| 67 |
++if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND |
| 68 |
+ (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4)) |
| 69 |
+ # OpenEXR 2.4 or 2.5 with exported config |
| 70 |
+ set (FOUND_OPENEXR_WITH_CONFIG 1) |
| 71 |
|
| 72 |
diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild |
| 73 |
index ceada4f92ae6..3dd9f84f2cf7 100644 |
| 74 |
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild |
| 75 |
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild |
| 76 |
@@ -63,6 +63,10 @@ RESTRICT="test" |
| 77 |
|
| 78 |
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" |
| 79 |
|
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch |
| 82 |
+) |
| 83 |
+ |
| 84 |
llvm_check_deps() { |
| 85 |
has_version -r "sys-devel/clang:${LLVM_SLOT}" |
| 86 |
} |
| 87 |
@@ -85,9 +89,6 @@ src_configure() { |
| 88 |
local gcc=$(tc-getCC) |
| 89 |
|
| 90 |
local mycmakeargs=( |
| 91 |
- # Force use of OpenEXR/ilmbase |
| 92 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON |
| 93 |
- |
| 94 |
# LLVM 10+ needs C++14 |
| 95 |
-DCMAKE_CXX_STANDARD=14 |
| 96 |
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
Archives