Commit Graph

162 Commits

Author SHA1 Message Date
NomisIV
8b41a83a35 blender: add option for OptiX 2020-12-14 09:41:47 +01:00
Dmitry Kalinkin
492f3b80ab
blender: fix on darwin 2020-11-26 14:51:18 -05:00
Dmitry Kalinkin
d9d8c8a7fc
blender: use ffmpeg instead of ffmpeg_3
build_files/cmake/Modules/FindFFmpeg.cmake currently searches for
libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on
darwin).
2020-11-26 14:49:54 -05:00
tilpner
57da6df40f
blender: 2.90.1 -> 2.91.0 2020-11-25 21:47:35 +01:00
Andrew Valencik
075014385e blender: 2.90.0 -> 2.90.1 2020-09-27 22:40:55 -04:00
Gabriel Ebner
6b74f99abd blender: 2.83.5 -> 2.90.0 2020-09-18 15:19:57 +02:00
R. RyanTM
1c5d2884b1
blender: 2.83.4 -> 2.83.5 (#96214) 2020-08-24 22:10:50 -04:00
R. RyanTM
87911328d4 blender: 2.83.3 -> 2.83.4 2020-08-13 02:14:18 +00:00
R. RyanTM
5891c750ed blender: 2.83.1 -> 2.83.3 2020-07-31 16:07:37 +00:00
Dmitry Kalinkin
5760e275f4
blender: don't require python3.7m on darwin
python is currently pointing to the python38, so this patches the
required version to match python version that is provided to the
expression. The m prefix denotes the pymalloc ABI for python 3.7 and
older, but is not provided starting python 3.8.
2020-06-30 22:27:08 -04:00
R. RyanTM
8ca6d3801a blender: 2.83.0 -> 2.83.1 2020-06-30 23:39:50 +00:00
Frederik Rietdijk
1523382160 Merge master into staging-next 2020-06-13 11:02:21 +02:00
Frederik Rietdijk
98f95ef9c4 blender: fix build with python 3.8
Since Python 3.8 an `m` is no longer added when pymalloc is used.
https://bugs.python.org/issue36707
2020-06-12 22:00:09 +02:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Dmitry Kalinkin
3d6ea5fd08
blender: add veprbl to maintainers 2020-06-09 11:56:50 -04:00
R. RyanTM
e49189078f
blender: 2.82a -> 2.83.0
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-06-09 11:55:48 -04:00
LeshaInc
3c54b996ca
blender: build with OpenImageDenoise support 2020-03-18 12:58:12 +02:00
R. RyanTM
4d8cac34f7
blender: 2.82 -> 2.82a (#82450) 2020-03-13 20:12:28 -04:00
Murray Campbell
fd614a72e9
blender: use PYTHONPATH (#82341)
See [blender patch](https://developer.blender.org/D6598)
2020-03-12 14:41:25 -04:00
Dmitry Kalinkin
27578856bf
blender: fix enableNumpy option, enable it unconditionally
Workarounds https://developer.blender.org/T74304

Audaspace requires numpy, we already have to provide numpy
unconditionally via PYTHON_NUMPY_PATH.
2020-02-29 14:19:11 -05:00
Gabriel Ebner
128c99978d blender: enable alembic 2020-02-23 12:10:53 +01:00
Dmitry Kalinkin
ac560382c5
blender: fix build on darwin
We don't compile blender with alembic. The linux build is able to detect
that, but this is not done for darwin. This explicitly disables alembic
to fix blender build on darwin.
2020-02-15 06:39:27 -05:00
R. RyanTM
8a2c2e48b4 blender: 2.81a -> 2.82 2020-02-15 01:46:17 +00:00
Dmitry Kalinkin
8aa0e2fe1d
blender: switch from openimageio to openimageio2 2020-01-10 13:55:49 -05:00
Dmitry Kalinkin
2287d54e7d
blender: fix on darwin
This enables building of Blender.app. The standard build process assumes
that the dependencies are installed in subdirectoris inside $LIBDIR with
libraries built as static. In current implementation we are not looking
to achieve portability, so cmake files are patched to link dynamically
with the libraries in the nix store. Linking to the transitive
dependencies is not needed in the shared case. There are also some minor
inconsistensies in the expected paths, which also need to be patched.

Alternatively, we could patch cmake files to treat darwin as "unix", but
that would require more tweaking to ensure that the frameworks are being
linked properly.
2020-01-09 02:54:50 -05:00
Dmitry Kalinkin
e57392dbc2
blender: switch to OpenJPEG 2.x
Fixes:

-- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)

and

  - WITH_IMAGE_OPENJPEG         OFF
2020-01-09 02:53:06 -05:00
R. RyanTM
dfa93d552c blender: 2.81 -> 2.81a 2019-12-22 20:36:57 -08:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Gabriel Ebner
cc8ddeefea blender: 2.80 -> 2.81 2019-11-21 20:25:07 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Edmund Wu
67209e1b20
blender: 2.97b -> 2.80 2019-08-02 08:58:49 -04:00
Ambroz Bizjak
28a0918916 Add driver library path to some packages to find CUDA libraries.
This is to avoid relying on LD_LIBRARY_PATH for finding the CUDA driver libraries.
2019-05-22 18:34:09 +02:00
Jan Malakhovski
11b6496557 blender: move defaults to package file 2019-02-03 15:32:13 +00:00
Edmund Wu
f97baf13b0 blender: fix python 2019-01-14 10:07:27 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Eelco Dolstra
854e069107 blender: Optionally enable numpy support
This is required by some included addons (such as ANT landscape). Note
that we can't use -DWITH_PYTHON_INSTALL_NUMPY=ON because it's
conditional on -DWITH_PYTHON_INSTALL=ON.
2018-03-30 22:03:40 +02:00
Ryan Mulligan
1c7e358e3f blender: 2.79a -> 2.79b
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/blender/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py help` got 0 exit code
- found 2.79b with grep in /nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b
- directory tree listing: https://gist.github.com/31e73f72bba2c0103ef5f038b4346d34
2018-03-25 11:42:59 -07:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Eelco Dolstra
9f4b1ee686 blender: 2.79 -> 2.79a 2018-03-01 19:53:34 +01:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Nikolay Amiantov
22b582821d blender: fix build with new cudatoolkit 2017-10-19 12:47:56 +03:00
Nikolay Amiantov
378bfba023 treewide: use default compiler for cuda 2017-10-19 12:47:30 +03:00
Eelco Dolstra
afc0218ecd blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
2017-09-16 22:45:22 +02:00
Eelco Dolstra
e3b562e0e2 blender: 2.78c -> 2.79 2017-09-13 09:54:42 +02:00
Cillian de Róiste
8fb5217cf7 blender metadata: fix homepage 2017-08-03 23:03:03 +02:00
Nikolay Amiantov
fe33c28ec9 blender: fix libOpenCL path 2017-03-01 02:51:18 +03:00
Eelco Dolstra
ffb0fb51d4 blender: 2.78b -> 2.78c 2017-02-28 17:50:42 +01:00
Eelco Dolstra
c4fab214fa blender: 2.78a -> 2.78b 2017-02-11 22:17:28 +01:00
Eelco Dolstra
5926192e55 blender: 2.78 -> 2.78a 2016-11-01 22:52:48 +01:00
Eelco Dolstra
2537bc8546 blender: 2.77a -> 2.78
Also fix the openjpeg dependency (it has to be openjpeg 1), and use
jemalloc which is also what the upstream binaries use.
2016-09-30 21:49:14 +02:00
Eelco Dolstra
452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Nikolay Amiantov
5041e0eea9 blender: fix build, don't install builtin Python 2016-08-22 16:39:33 +03:00
Eelco Dolstra
9fa5c5d461 blender: 2.77 -> 2.77a 2016-04-08 19:58:04 +02:00
Eelco Dolstra
7f61c7289f blender: Disable i686-linux build
The openimageio dependency doesn't build on i686. But probably nobody
cares about running Blender on 32-bit anymore.

http://hydra.nixos.org/build/33602734
2016-03-25 16:44:02 +01:00
Eelco Dolstra
4f47fe2f9c blender: 2.76b -> 2.77 2016-03-22 21:33:54 +01:00
Eelco Dolstra
43147bedab blender: Update to 2.76b 2015-11-05 13:48:22 +01:00
Eelco Dolstra
5ea6330f77 blender: Update to 2.76 2015-10-12 20:05:35 +02:00
Bjørn Forsman
1357692555 blender: take unversioned cudatoolkit attr
Makes it less weird to do an override, if a user wants to use e.g. cuda
6.5 (also requires gcc 4.8).
2015-08-19 07:27:59 +02:00
Bjørn Forsman
69367e4ebc blender: unbreak cudaSupport
Currently it errors out at build time with:

/nix/store/HASH-cudatoolkit-6.5.19/usr_include/host_config.h:82:2:
  error: #error -- unsupported GNU version! gcc 4.9 and up are not supported!

Instead of downgrading gcc to 4.8, this patch upgrades cuda to 7.0, which
I think is the better choice. (Cuda 7 dropped support for some older graphics
cards, but gained support for newer ones.)
2015-08-18 23:22:06 +02:00
Eelco Dolstra
aca6eb1fdb blender: Update to 2.75a 2015-07-09 19:14:57 +02:00
Eelco Dolstra
f3e2b31297 blender: Update to 2.75
(cherry picked from commit 36779d90e2b7e93ec5387cc5b5d106a037eb3d11)
2015-07-02 15:36:46 +02:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
Eelco Dolstra
b8ccb390b3 blender: Update to 2.74 2015-04-01 13:31:05 +02:00
Cillian de Róiste
79f3689289 Blender: enable blenderplayer 2015-03-15 23:36:46 +01:00
Eelco Dolstra
4a779f4d9a blender: Support GeForce 9xx cards 2015-03-02 00:24:04 +01:00
Eelco Dolstra
480602bea1 blender: Update to 2.73a 2015-01-23 12:20:17 +01:00
Luca Bruno
5f12045f34 blender: fix build after update to 2.73 2015-01-13 21:35:22 +01:00
Eelco Dolstra
b0321dadcb blender: Update to 2.73 2015-01-10 12:24:18 +01:00
Vladimír Čunát
de572de4f0 blender: fix build by upstream patch
The freetype-2.5.4 update changed signedness of some struct fields.
2014-12-25 16:52:39 +01:00
Eelco Dolstra
49f53f63f5 blender: Add OpenCOLLADA support 2014-12-23 18:17:09 +01:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Eelco Dolstra
2ed8458cf2 blender: Update to 2.72b 2014-10-22 22:22:39 +02:00
Eelco Dolstra
58de52c6f0 blender: Update to 2.72 2014-10-05 21:50:22 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Vladimír Čunát
54ae9d8527 blender: fix build by dropping patch integrated upstream
It no longer applied, and the CMakeLists.txt looked completely different.
Such changes without any version bump... (sigh)
2014-08-14 15:13:39 +02:00
Eelco Dolstra
18e422d047 blender: Optionally build with CUDA support
This is required for GPU acceleration of the Cycles renderer.
2014-08-09 12:37:46 +02:00
Vladimír Čunát
4d6503e5b5 blender: fix parallel builds
(cherry picked from commits f63fb3fda0 + 5fa61a2904)
2014-08-02 11:17:25 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra
327c2061d1 blender: Don't use system openjpeg
It was ignored anyway (instead using the internal openjpeg copy).
2014-07-15 23:34:34 +02:00
Eelco Dolstra
12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra
457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra
2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Eelco Dolstra
4844969689 blender: Make JACK support optional. 2014-05-19 21:47:11 +02:00
Vladimír Čunát
4ac818601e blender: fix build and minor update to 2.70a
It seems it needs to explicitly know python version in case of 3.4.
2014-05-16 22:55:55 +02:00
Cillian de Róiste
7381035bc2 blender: update from 2.69 to 2.70 2014-03-26 22:25:40 +01:00
Cillian de Róiste
8c83ae965f blender: upgrade from 2.67 to 2.69 and add myself as maintainter 2014-02-18 22:11:39 +01:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
3810378b79 blender: update to 2.67 2013-05-13 10:03:33 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Cillian de Róiste
49b23b29dd Blender: Tidy up, sort inputs, remove unused OPENJPEG option 2013-03-28 01:00:22 +01:00
Cillian de Róiste
ca2a39757c Blender: enable extra features in the Video Sequence Editor
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
2013-03-28 00:52:08 +01:00
Cillian de Róiste
64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Vladimír Čunát
26e4a5561c blender: add the forgotten patch 2013-02-16 18:38:52 +01:00
Vladimír Čunát
08abf5a84a blender: minor update to work with libpng-1.6
also other fixes needed in order to build
2013-02-16 18:13:05 +01:00
Marc Weber
8cb034fd30 fix blender build and enable parallel building 2012-09-19 22:41:15 +02:00
Peter Simons
08b29c6f96 blender: update to version 2.63a 2012-07-07 11:31:32 +02:00