Commit Graph

56 Commits

Author SHA1 Message Date
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
Lluís Batlle i Rossell
a9b800c8af Updating blender to 2.67. Maybe this will build in stdenv-updates too.
I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
2012-02-26 20:47:12 +00:00
Cillian de Roiste
1cdd246d2b Updating Blender to the stable release 2.57 and adding python32 as a build input
svn path=/nixpkgs/trunk/; revision=26894
2011-04-19 20:17:17 +00:00
Lluís Batlle i Rossell
e47a2a9651 Adding blender 2.49, additional to the last 'alpha' 2.50 there already was in nixpkgs.
I put the alpha in lowPrio too; too many things don't work still, there.

svn path=/nixpkgs/trunk/; revision=21701
2010-05-10 10:20:51 +00:00
Lluís Batlle i Rossell
d770597dda I wrote a bad 'name' for blender before. Fixing.
svn path=/nixpkgs/trunk/; revision=21674
2010-05-08 22:33:20 +00:00
Lluís Batlle i Rossell
c82a9ac921 Updating blender
svn path=/nixpkgs/trunk/; revision=21670
2010-05-08 21:25:56 +00:00
Marc Weber
aa037e3af6 also use gcc-4.2 for blender. gcc-4.3 is causing another segfault.
I haven't checked pre 2.49 though

svn path=/nixpkgs/trunk/; revision=15499
2009-05-07 14:51:29 +00:00