From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D5C5158086 for ; Thu, 2 Dec 2021 04:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 617B4E0839; Thu, 2 Dec 2021 04:54:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27842E0839 for ; Thu, 2 Dec 2021 04:54:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB831343275 for ; Thu, 2 Dec 2021 04:54:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 887C08E for ; Thu, 2 Dec 2021 04:54:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638420863.4a75e3cc1b8326d387b156282e4f9635b4a97197.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/files/osl-1.11.16.0-no-imath.patch media-libs/osl/osl-1.11.16.0-r2.ebuild X-VCS-Directories: media-libs/osl/files/ media-libs/osl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a75e3cc1b8326d387b156282e4f9635b4a97197 X-VCS-Branch: master Date: Thu, 2 Dec 2021 04:54:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb4d4305-d312-4103-a320-1c1913cae007 X-Archives-Hash: 0912be3e6897e5d96c02dbe81cbce9ff commit: 4a75e3cc1b8326d387b156282e4f9635b4a97197 Author: Sam James gentoo org> AuthorDate: Thu Dec 2 04:54:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 2 04:54:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a75e3cc media-libs/osl: try again to force ilmbase Signed-off-by: Sam James gentoo.org> media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 +++++++++++++++++++++++ media-libs/osl/osl-1.11.16.0-r2.ebuild | 7 ++-- 2 files changed, 53 insertions(+), 3 deletions(-) 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 new file mode 100644 index 000000000000..a8e5c1f23116 --- /dev/null +++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch @@ -0,0 +1,49 @@ +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) diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild index ceada4f92ae6..3dd9f84f2cf7 100644 --- a/media-libs/osl/osl-1.11.16.0-r2.ebuild +++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild @@ -63,6 +63,10 @@ RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch +) + llvm_check_deps() { has_version -r "sys-devel/clang:${LLVM_SLOT}" } @@ -85,9 +89,6 @@ src_configure() { local gcc=$(tc-getCC) local mycmakeargs=( - # Force use of OpenEXR/ilmbase - -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON - # LLVM 10+ needs C++14 -DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"