nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Blender: Update to a beta release of 2.80. 

Fixes <https://bugs.gnu.org/33608> and <https://bugs.gnu.org/33882>.

* gnu/packages/graphics.scm (blender): Update to 2.80-beta-0.3c3d80e.
[source]: Fetch from the Git repository.
[inputs]: Use OpenJPEG 2. Add Numpy.
[arguments]: Specify the location of Numpy. Remove some configure flags that are
no longer used. Comment out the 'fix-broken-import' phase because the
file it patches doesn't exist in the Git sources.
[description]: Add a warning about the beta status.
This commit is contained in:
Leo Famulari 2018-12-25 01:58:35 -05:00
parent b96f0e6ff9
commit fc51c28ae8
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnu/packages/graphics.scm
View File

@ -76,17 +76,20 @@
#:use-module (guix utils)) #:use-module (guix utils))
(define-public blender (define-public blender
(let ((revision "0")
(commit "3c3d80ea22af15e13237f978181a881b90c41e7c"))
(package (package
(name "blender") (name "blender")
(version "2.79b") (version (git-version "2.80-beta" revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://download.blender.org/source/" (uri (git-reference
"blender-" version ".tar.gz")) (url "https://git.blender.org/blender.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")) "1hhn8pf3a5556mxyrb2ggsiy6q0h75hnkdpcgq9b6vg284jl2l4q"))))
(patches (search-patches "blender-newer-ffmpeg.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python)))) (let ((python-version (version-major+minor (package-version python))))
@ -98,29 +101,30 @@
"-DWITH_CYCLES=ON" "-DWITH_CYCLES=ON"
"-DWITH_DOC_MANPAGE=ON" "-DWITH_DOC_MANPAGE=ON"
"-DWITH_FFTW3=ON" "-DWITH_FFTW3=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_IMAGE_OPENJPEG=ON"
"-DWITH_INPUT_NDOF=ON" "-DWITH_INPUT_NDOF=ON"
"-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_JACK=ON" "-DWITH_JACK=ON"
"-DWITH_MOD_OCEANSIM=ON" "-DWITH_MOD_OCEANSIM=ON"
"-DWITH_PLAYER=ON"
"-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_SYSTEM_OPENJPEG=ON"
(string-append "-DPYTHON_LIBRARY=python" ,python-version "m") (string-append "-DPYTHON_LIBRARY=python" ,python-version "m")
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
"/lib") "/lib")
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
"/include/python" ,python-version "m") "/include/python" ,python-version "m")
(string-append "-DPYTHON_VERSION=" ,python-version)) (string-append "-DPYTHON_VERSION=" ,python-version)
(string-append "-DPYTHON_NUMPY_PATH="
(assoc-ref %build-inputs "python-numpy")
"/lib/python" ,python-version "/site-packages/"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-broken-import ;; XXX This file doesn't exist in the Git sources but will probably
(lambda _ ;; exist in the eventual 2.80 source tarball.
(substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" ; (add-after 'unpack 'fix-broken-import
(("import encode_bin") "from . import encode_bin")) ; (lambda _
#t)) ; (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
; (("import encode_bin") "from . import encode_bin"))
; #t))
(add-after 'set-paths 'add-ilmbase-include-path (add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear ;; OpenEXR propagates ilmbase, but its include files do not appear
@ -138,7 +142,7 @@
("openimageio" ,openimageio) ("openimageio" ,openimageio)
("openexr" ,openexr) ("openexr" ,openexr)
("ilmbase" ,ilmbase) ("ilmbase" ,ilmbase)
("openjpeg" ,openjpeg-1) ("openjpeg" ,openjpeg)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
@ -150,6 +154,7 @@
("glew" ,glew) ("glew" ,glew)
("openal" ,openal) ("openal" ,openal)
("python" ,python) ("python" ,python)
("python-numpy" ,python-numpy)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")
@ -157,8 +162,11 @@
"Blender is a 3D graphics creation suite. It supports the entirety of "Blender is a 3D graphics creation suite. It supports the entirety of
the 3D pipeline—modeling, rigging, animation, simulation, rendering, the 3D pipeline—modeling, rigging, animation, simulation, rendering,
compositing and motion tracking, even video editing and game creation. The compositing and motion tracking, even video editing and game creation. The
application can be customized via its API for Python scripting.") application can be customized via its API for Python scripting.
(license license:gpl2+)))
WARNING: This package offers a beta build of Blender, because the stable release
no longer works in Guix. See @uref{https://issues.guix.info/issue/33882}.")
(license license:gpl2+))))
(define-public assimp (define-public assimp
(package (package