diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-16 01:51:50 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-16 01:51:50 +0100 |
| commit | 6144cd2e90f8e3623912112050c8d2025de44f0a (patch) | |
| tree | bf6abe7c75cda0f602c2d522c905278a620a5cbf /media-libs/osl | |
| parent | ca144cbf71b2faf598564847378fa40a0090d67c (diff) | |
gentoo auto-resync : 16:10:2022 - 01:51:50
Diffstat (limited to 'media-libs/osl')
| -rw-r--r-- | media-libs/osl/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index d5375400dc2c..bca52fa998a2 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,4 +1,3 @@ -AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953 AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2 DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828 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 deleted file mode 100644 index a8e5c1f23116..000000000000 --- a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch +++ /dev/null @@ -1,49 +0,0 @@ -Force finding OpenEXR / IlmBase instead of imath for now. ---- a/src/cmake/modules/FindOpenEXR.cmake -+++ b/src/cmake/modules/FindOpenEXR.cmake -@@ -39,43 +39,10 @@ - # - - # First, try to fine just the right config files --find_package(Imath CONFIG) --if (NOT TARGET Imath::Imath) -- # Couldn't find Imath::Imath, maybe it's older and has IlmBase? -- find_package(IlmBase CONFIG) --endif () -+find_package(IlmBase CONFIG) - find_package(OpenEXR CONFIG) - --if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath) -- # OpenEXR 3.x if both of these targets are found -- set (FOUND_OPENEXR_WITH_CONFIG 1) -- if (NOT OpenEXR_FIND_QUIETLY) -- message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})") -- endif () -- -- # Mimic old style variables -- set (OPENEXR_VERSION ${OpenEXR_VERSION}) -- get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) -- get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) -- get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES) -- get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES) -- set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY}) -- set (ILMBASE_FOUND true) -- -- get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES) -- set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES}) -- set (OPENEXR_FOUND true) -- -- # Link with pthreads if required -- find_package (Threads) -- if (CMAKE_USE_PTHREADS_INIT) -- list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) -- endif () -- --elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND -+if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND - (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4)) - # OpenEXR 2.4 or 2.5 with exported config - set (FOUND_OPENEXR_WITH_CONFIG 1) |