From db6f54bd2555efe0bd16a384b0444c6c72490130 Mon Sep 17 00:00:00 2001
Message-ID: <db6f54bd2555efe0bd16a384b0444c6c72490130.1703867045.git.cwebber@dustycloud.org>
In-Reply-To: <e3f1d5554676dc40bd4e76b6b01554472aa8a939.1703867045.git.cwebber@dustycloud.org>
References: <e3f1d5554676dc40bd4e76b6b01554472aa8a939.1703867045.git.cwebber@dustycloud.org>
From: Christine Lemmer-Webber <cwebber@dustycloud.org>
Date: Fri, 29 Dec 2023 11:16:09 -0500
Subject: [PATCH 2/2] gnu: blender: Update to 3.6.7.
* gnu/packages/graphics.scm (blender): Update to 3.6.7.
[arguments]<#:phases>: Remove no longer required fix-broken-import phase.
[inputs] Switch freetype to freetype-with-brotli and add libepoxy.
Change-Id: I42690a2de4b36806f9ad3aa08c71ff78e87b1651
Signed-off-by: Christine Lemmer-Webber <cwebber@dustycloud.org>
---
gnu/packages/graphics.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
@@ -494,14 +494,14 @@ (define-public openvdb
(define-public blender
(package
(name "blender")
- (version "3.3.5") ;3.3.x is the current LTS version
+ (version "3.6.7") ;3.6.x is the current LTS version
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz"))
(sha256
(base32
- "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
+ "10i42w5l0xrz30x9y0ba5q2g05ixlzw1gprhrgzzvrjgy1vgp00x"))))
(build-system cmake-build-system)
(arguments
(list
@@ -544,25 +544,19 @@ (define-public blender
;; satisfy the dependency on "half.h" and "Iex.h".
(string-append "-DCMAKE_CXX_FLAGS=-I"
(search-input-directory %build-inputs
- "include/OpenEXR"))))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-broken-import
- (lambda _
- (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
- (("import encode_bin")
- "from . import encode_bin")))))))
+ "include/OpenEXR"))))))
(inputs
(list boost
embree
ffmpeg-5
fftw
- freetype
+ freetype-with-brotli
glew
gmp ;needed for boolean operations on meshes
ilmbase
jack-1
jemalloc
+ libepoxy
libjpeg-turbo
libpng
libsndfile
--
2.41.0