From ebaf658acd14b0fc37911007d9860e1f42837e5b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 2 Apr 2024 21:20:34 -0300 Subject: [PATCH] gnu: blender: Update to 3.6.10. * gnu/packages/graphics.scm (blender): Update to 3.6.10. [arguments]<#:configure-flags>: Unset "-DCMAKE_CXX_FLAGS". <#:phases>: Delete the fix-broken-import phase. [inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase with imath, openexr-2 with openexr. Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed --- gnu/packages/graphics.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 03f0c4eb81..05007c5818 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -493,14 +493,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.10") ;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")))) + "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) (build-system cmake-build-system) (arguments (list @@ -536,32 +536,19 @@ (define-public blender (string-append "-DPYTHON_NUMPY_PATH=" (assoc-ref %build-inputs "python-numpy") "/lib/python" #$python-version - "/site-packages/") - ;; OpenEXR propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH, so we need to add - ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to - ;; 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"))))))) + "/site-packages/"))))) (inputs (list boost embree ffmpeg-5 fftw - freetype + freetype-with-brotli glew gmp ;needed for boolean operations on meshes - ilmbase + imath jack-1 jemalloc + libepoxy libjpeg-turbo libpng libsndfile @@ -571,7 +558,7 @@ (define-public blender libxrender openal opencolorio - openexr-2 + openexr openimageio openjpeg opensubdiv