commit:     69dd24dbdf04ff640a50d23f84089c62256e202f
Author:     Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Thu Feb 17 15:55:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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)

Reply via email to