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 0FA3515808B for ; Sat, 26 Feb 2022 23:06:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29067E0930; Sat, 26 Feb 2022 23:06:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04049E0930 for ; Sat, 26 Feb 2022 23:06:58 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF095342D88 for ; Sat, 26 Feb 2022 23:06:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6866F2DC for ; Sat, 26 Feb 2022 23:06:55 +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: <1645916740.949005d1a1d77647a097371ba116be2f740c4b8c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild X-VCS-Directories: media-libs/opencolorio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 949005d1a1d77647a097371ba116be2f740c4b8c X-VCS-Branch: master Date: Sat, 26 Feb 2022 23:06:55 +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: e2ed101c-4ac4-4ba5-9ee9-d8741a2a03ca X-Archives-Hash: a8279b8d4a884cbd61a1bc0f22acb606 commit: 949005d1a1d77647a097371ba116be2f740c4b8c Author: Sam James gentoo org> AuthorDate: Sat Feb 26 23:03:45 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 26 23:05:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949005d1 media-libs/opencolorio: avoid automagic OSL test dependency If OSL has not yet been rebuilt against new OpenEXR and so on, it might lead to a build failure. Let's just avoid the test dep entirely. Closes: https://bugs.gentoo.org/833933 Signed-off-by: Sam James gentoo.org> media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild index b8551efefa43..16fb18b5889c 100644 --- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild +++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild @@ -64,6 +64,10 @@ src_prepare() { sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die + + # Avoid automagic test dependency on OSL, bug #833933 + # Can cause problems during e.g. OpenEXR unsplitting migration + cmake_run_in tests cmake_comment_add_subdirectory osl } src_configure() {