Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
Date: Sun, 20 Feb 2022 21:10:24
Message-Id: 1645391072.69dd24dbdf04ff640a50d23f84089c62256e202f.sam@gentoo
1 commit: 69dd24dbdf04ff640a50d23f84089c62256e202f
2 Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
3 AuthorDate: Thu Feb 17 15:55:34 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 21:04:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dd24db
7
8 media-gfx/blender: Fix live ebuild
9
10 Upstream has patched in OpenEXR3 and OpenImageIO 2.3 support.
11 Therefore we don't need to use our own patches anymore.
12
13 Also add new "DWITH_SYSTEM_FREETYPE" build flag.
14
15 Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 media-gfx/blender/blender-9999.ebuild | 7 +------
19 1 file changed, 1 insertion(+), 6 deletions(-)
20
21 diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
22 index 39bf9fc09fa6..349a113d757b 100644
23 --- a/media-gfx/blender/blender-9999.ebuild
24 +++ b/media-gfx/blender/blender-9999.ebuild
25 @@ -123,11 +123,6 @@ BDEPEND="
26 nls? ( sys-devel/gettext )
27 "
28
29 -PATCHES=(
30 - "${FILESDIR}"/${PN}-3.0.1-openexr.patch
31 - "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
32 -)
33 -
34 blender_check_requirements() {
35 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
36
37 @@ -234,7 +229,6 @@ src_configure() {
38 -DWITH_HEADLESS=$(usex headless)
39 -DWITH_INSTALL_PORTABLE=OFF
40 -DWITH_IMAGE_DDS=$(usex dds)
41 - -DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
42 -DWITH_IMAGE_OPENEXR=$(usex openexr)
43 -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
44 -DWITH_IMAGE_TIFF=$(usex tiff)
45 @@ -263,6 +257,7 @@ src_configure() {
46 -DWITH_SDL=$(usex sdl)
47 -DWITH_STATIC_LIBS=OFF
48 -DWITH_SYSTEM_EIGEN3=ON
49 + -DWITH_SYSTEM_FREETYPE=ON
50 -DWITH_SYSTEM_GLEW=ON
51 -DWITH_SYSTEM_LZO=ON
52 -DWITH_TBB=$(usex tbb)