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 D05D315808B for ; Sat, 12 Feb 2022 15:01:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08E38E07EF; Sat, 12 Feb 2022 15:01:21 +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 E37A7E07EF for ; Sat, 12 Feb 2022 15:01:20 +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 F40D4342E5C for ; Sat, 12 Feb 2022 15:01:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39F2E2D2 for ; Sat, 12 Feb 2022 15:01:18 +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: <1644677896.065ec4efaff92d4abe6e55ecbc7c58ba1544d541.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-2.93.8-r1.ebuild media-gfx/blender/blender-2.93.8-r2.ebuild media-gfx/blender/blender-3.0.1-r2.ebuild media-gfx/blender/blender-3.0.1-r3.ebuild media-gfx/blender/files/blender-3.0.1-openexr.patch X-VCS-Directories: media-gfx/blender/files/ media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 065ec4efaff92d4abe6e55ecbc7c58ba1544d541 X-VCS-Branch: master Date: Sat, 12 Feb 2022 15:01:18 +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: 1485da38-7fbe-4ec6-8945-f115fece096b X-Archives-Hash: c0e6f38beb5d3d1788bb6f422df240cb commit: 065ec4efaff92d4abe6e55ecbc7c58ba1544d541 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 14:58:16 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 12 14:58:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065ec4ef media-gfx/blender: force finding imath-3 in 2.93.8/3.0.1 We'd pick up media-libs/ilmbase even if we (probably) wouldn't use it, so let's not do that, as we're switching to OpenEXR 3. Bug: https://bugs.gentoo.org/832862 Closes: https://bugs.gentoo.org/833184 Signed-off-by: Sam James gentoo.org> .../blender/{blender-2.93.8-r1.ebuild => blender-2.93.8-r2.ebuild} | 0 .../blender/{blender-3.0.1-r2.ebuild => blender-3.0.1-r3.ebuild} | 0 media-gfx/blender/files/blender-3.0.1-openexr.patch | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/blender/blender-2.93.8-r1.ebuild b/media-gfx/blender/blender-2.93.8-r2.ebuild similarity index 100% rename from media-gfx/blender/blender-2.93.8-r1.ebuild rename to media-gfx/blender/blender-2.93.8-r2.ebuild diff --git a/media-gfx/blender/blender-3.0.1-r2.ebuild b/media-gfx/blender/blender-3.0.1-r3.ebuild similarity index 100% rename from media-gfx/blender/blender-3.0.1-r2.ebuild rename to media-gfx/blender/blender-3.0.1-r3.ebuild diff --git a/media-gfx/blender/files/blender-3.0.1-openexr.patch b/media-gfx/blender/files/blender-3.0.1-openexr.patch index b1ea45acc76e..3ff6b213b05f 100644 --- a/media-gfx/blender/files/blender-3.0.1-openexr.patch +++ b/media-gfx/blender/files/blender-3.0.1-openexr.patch @@ -12,8 +12,8 @@ index 09af546..dfe15cd 100644 # Old versions (before 2.0?) do not have any version string, just assuming this should be fine though. SET(_openexr_libs_ver_init "2.0") -+find_package(Imath CONFIG QUIET) -+if(TARGET Imath::Imath) ++find_package(Imath-3 CONFIG QUIET) ++if(TARGET Imath-3::Imath) +SET(_openexr_FIND_COMPONENTS + Imath + Iex