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 EBAE3158086 for ; Mon, 1 Nov 2021 12:37:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DC78E0825; Mon, 1 Nov 2021 12:37:15 +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 2FA23E0825 for ; Mon, 1 Nov 2021 12:37:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2B3B5342D9D for ; Mon, 1 Nov 2021 12:37:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95D39163 for ; Mon, 1 Nov 2021 12:37:12 +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: <1635770209.1d79435986200507cccba60dd4bcf2cf168f5a0c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild media-libs/openimageio/openimageio-2.3.8.0.ebuild X-VCS-Directories: media-libs/openimageio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1d79435986200507cccba60dd4bcf2cf168f5a0c X-VCS-Branch: master Date: Mon, 1 Nov 2021 12:37:12 +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: 8623e04b-ee2c-4f22-aa9c-bde9d04815c9 X-Archives-Hash: eb312c4039292787bae71052e2545b03 commit: 1d79435986200507cccba60dd4bcf2cf168f5a0c Author: Sam James gentoo org> AuthorDate: Mon Nov 1 12:35:54 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 1 12:36:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d794359 media-libs/openimageio: fix building against OpenEXR 2 Closes: https://bugs.gentoo.org/821193 Signed-off-by: Sam James gentoo.org> ...{openimageio-2.3.8.0.ebuild => openimageio-2.3.8.0-r1.ebuild} | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/media-libs/openimageio/openimageio-2.3.8.0.ebuild b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild similarity index 92% rename from media-libs/openimageio/openimageio-2.3.8.0.ebuild rename to media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild index 76bdf3609e2..77b43ff2ec1 100644 --- a/media-libs/openimageio/openimageio-2.3.8.0.ebuild +++ b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild @@ -103,6 +103,15 @@ pkg_setup() { } src_prepare() { + # Note: on bumps, please try again with OpenEXR 3 + ilmmath! + # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2 + # (because it mix and matches which version it uses; sed this to + # make sure it'll use OpenEXR 3 if it can, but it won't.) + # bug #821193 + sed -i \ + -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ + src/cmake/modules/FindOpenEXR.cmake || die + cmake_src_prepare cmake_comment_add_subdirectory src/fonts