unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Vinicius Monego <monego@posteo.net>
To: 70035@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#70035] [PATCH v3 9/9] gnu: blender: Update to 3.6.10.
Date: Wed,  3 Apr 2024 01:30:29 +0000	[thread overview]
Message-ID: <6f9730b7537fc44d36c0b28db981919d16c3f965.1712107465.git.monego@posteo.net> (raw)
In-Reply-To: <cover.1712107465.git.monego@posteo.net>

* gnu/packages/graphics.scm (blender): Update to 3.6.10.
[arguments]<#:configure-flags>: Unset "-DPYTHON_LIBRARY", "-DPYTHON_LIBPATH",
"-DPYTHON_VERSION", "-DPYTHON_NUMPY_INCLUDE_DIRS", "-DPYTHON_NUMPY_PATH",
"-DCMAKE_CXX_FLAGS".
[inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase
with imath, openexr-2 with openexr.

Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed
---
 gnu/packages/graphics.scm | 43 +++++++--------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 555800e517..fc99da8a12 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
@@ -520,48 +520,19 @@ (define-public blender
                 "-DWITH_MOD_OCEANSIM=ON"
                 "-DWITH_OPENVDB=ON"
                 "-DWITH_OPENSUBDIV=ON"
-                "-DWITH_PYTHON_INSTALL=OFF"
-                (string-append "-DPYTHON_LIBRARY=python" #$python-version)
-                (string-append "-DPYTHON_LIBPATH="
-                               (assoc-ref %build-inputs "python")
-                               "/lib")
-                (string-append "-DPYTHON_INCLUDE_DIR="
-                               (assoc-ref %build-inputs "python")
-                               "/include/python" #$python-version)
-                (string-append "-DPYTHON_VERSION=" #$python-version)
-                (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
-                               (assoc-ref %build-inputs "python-numpy")
-                               "/lib/python" #$python-version
-                               "/site-packages/numpy/core/include/")
-                (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")))))))
+                "-DWITH_PYTHON_INSTALL=OFF"))))
     (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 +542,7 @@ (define-public blender
            libxrender
            openal
            opencolorio
-           openexr-2
+           openexr
            openimageio
            openjpeg
            opensubdiv
-- 
2.39.2





  parent reply	other threads:[~2024-04-03  1:32 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-27 17:15 [bug#70035] [PATCH 0/8] Update and cleanup ASWF tools Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 1/8] gnu: openimageio: Update to 2.5.9.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 2/8] gnu: openshadinglanguage: Update to 1.13.7.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 3/8] gnu: Add partio Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 4/8] gnu: Add pystring Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 5/8] gnu: Add minizip-ng Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 6/8] gnu: opencolorio: Update to 2.3.2 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 7/8] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 8/8] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-03-28 15:40 ` [bug#70035] [PATCH v2 0/8] Update and cleanup ASWF tools Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 1/8] gnu: openimageio: Update to 2.5.9.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 2/8] gnu: openshadinglanguage: Update to 1.13.7.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 3/8] gnu: Add partio Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 4/8] gnu: Add pystring Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 5/8] gnu: Add minizip-ng Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 6/8] gnu: opencolorio: Update to 2.3.2 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 7/8] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 8/8] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-04-03  1:30 ` [bug#70035] [PATCH v3 0/9] Update and cleanup ASWF tools Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 1/9] gnu: openimageio: Update to 2.5.10.1 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 2/9] gnu: openshadinglanguage: Update to 1.13.8.0 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 3/9] gnu: Add partio Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 4/9] gnu: Add pystring Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 5/9] gnu: Add minizip-ng Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 6/9] gnu: opencolorio: Update to 2.3.2 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 7/9] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 8/9] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-04-03  1:30   ` Vinicius Monego [this message]
2024-04-03 22:04     ` [bug#70035] [PATCH v3 9/9] gnu: blender: Update to 3.6.10 Vinicius Monego
2024-04-06 15:50 ` bug#70035: [PATCH 0/8] Update and cleanup ASWF tools Vinicius Monego

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6f9730b7537fc44d36c0b28db981919d16c3f965.1712107465.git.monego@posteo.net \
    --to=monego@posteo.net \
    --cc=70035@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).