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 256C115808B for ; Sun, 20 Feb 2022 21:10:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00A5EE0866; Sun, 20 Feb 2022 21:10:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D96D3E0845 for ; Sun, 20 Feb 2022 21:10:22 +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 DB9C134392E for ; Sun, 20 Feb 2022 21:10:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F1EF2A4 for ; Sun, 20 Feb 2022 21:10:20 +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: <1645391072.69dd24dbdf04ff640a50d23f84089c62256e202f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 69dd24dbdf04ff640a50d23f84089c62256e202f X-VCS-Branch: master Date: Sun, 20 Feb 2022 21:10:20 +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: 571ac38f-63b4-4ee2-9520-71fdbc93e815 X-Archives-Hash: 559532db82f135f2a325f62b07fd265a commit: 69dd24dbdf04ff640a50d23f84089c62256e202f Author: Sebastian Parborg gmail com> AuthorDate: Thu Feb 17 15:55:34 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 20 21:04:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dd24db media-gfx/blender: Fix live ebuild Upstream has patched in OpenEXR3 and OpenImageIO 2.3 support. Therefore we don't need to use our own patches anymore. Also add new "DWITH_SYSTEM_FREETYPE" build flag. Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-9999.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 39bf9fc09fa6..349a113d757b 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -123,11 +123,6 @@ BDEPEND=" nls? ( sys-devel/gettext ) " -PATCHES=( - "${FILESDIR}"/${PN}-3.0.1-openexr.patch - "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch -) - blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -234,7 +229,6 @@ src_configure() { -DWITH_HEADLESS=$(usex headless) -DWITH_INSTALL_PORTABLE=OFF -DWITH_IMAGE_DDS=$(usex dds) - -DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3" -DWITH_IMAGE_OPENEXR=$(usex openexr) -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) -DWITH_IMAGE_TIFF=$(usex tiff) @@ -263,6 +257,7 @@ src_configure() { -DWITH_SDL=$(usex sdl) -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_FREETYPE=ON -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_LZO=ON -DWITH_TBB=$(usex tbb)