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 0C498158086 for ; Thu, 4 Nov 2021 20:50:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B23D02BC004; Thu, 4 Nov 2021 20:50:48 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68D3B2BC004 for ; Thu, 4 Nov 2021 20:50:47 +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 3C350342F22 for ; Thu, 4 Nov 2021 20:50:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33A0583 for ; Thu, 4 Nov 2021 20:50:43 +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: <1636059024.ef7884410b54b7c9d64de39095a60c8f27a3f0cd.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.2.18.0-r1.ebuild media-libs/openimageio/openimageio-2.2.19.0.ebuild X-VCS-Directories: media-libs/openimageio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef7884410b54b7c9d64de39095a60c8f27a3f0cd X-VCS-Branch: master Date: Thu, 4 Nov 2021 20:50:43 +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: c2885138-89c2-47e4-86ab-a97151a349aa X-Archives-Hash: bda851c84b375bdda99545f6e1a6a7ed commit: ef7884410b54b7c9d64de39095a60c8f27a3f0cd Author: Sam James gentoo org> AuthorDate: Thu Nov 4 20:50:02 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 4 20:50:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef788441 media-libs/openimageio: avoid finding OpenEXR 3 for 2.2.{18,19} too Bug: https://bugs.gentoo.org/816264 Signed-off-by: Sam James gentoo.org> media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild | 9 +++++++++ media-libs/openimageio/openimageio-2.2.19.0.ebuild | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild index f22e98fc7b9..0aa03a21997 100644 --- a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild @@ -95,6 +95,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 } diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild index 5966a9f7ebd..41c76a3bcd1 100644 --- a/media-libs/openimageio/openimageio-2.2.19.0.ebuild +++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild @@ -95,6 +95,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 }