blender update to 2.48

adding some patches to compile dependencies and gav

svn path=/nixpkgs/trunk/; revision=15474

pkgs/applications/misc/blender/default.nix

@@ -1,10 +1,10 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "blender-2.46";
+  name = "blender-2.48";
 
   src = fetchurl {
-    url = http://download.blender.org/source/blender-2.46.tar.gz;
-    sha256 = "1l95lcrp5snmvzabw46qpnkxmqls3fc24b2qjkghfasvaq7km7rr";
+    url = http://download.blender.org/source/blender-2.48a.tar.gz;
+    sha256 = "0ijfpy510ls8xq1i8fb6j6wd0vac1jvnzmpiga4g7x1j4fg4s7bq";
   };
 
   phases="unpackPhase buildPhase";
@@ -12,7 +12,9 @@ stdenv.mkDerivation {
   inherit scons SDL freetype openal python openexr mesa;
 
   buildInputs = [python scons
-         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ];
+         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi 
+         ffmpeg
+         ];
 
   # patch SConstruct so that we can pass on additional include.  Either blender
   # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to

pkgs/development/libraries/ctl/default.nix

@@ -20,4 +20,6 @@ stdenv.mkDerivation {
       homepage = http://ampasctl.sourceforge.net;
       license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
   };
+
+  patches = [ ./patch.patch ];
 }

pkgs/development/libraries/ctl/patch.patch

@@ -0,0 +1,24 @@
+diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp
+index e662d22..a47311a 100644
+--- a/IlmCtl/CtlLex.cpp
++++ b/IlmCtl/CtlLex.cpp
+@@ -57,6 +57,7 @@
+ #include <CtlLContext.h>
+ #include <iomanip>
+ #include <cassert>
++#include <stdlib.h>
+ 
+ 
+ #if 0
+diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h
+index 6b000b2..8a39f7c 100644
+--- a/IlmCtlSimd/CtlSimdReg.h
++++ b/IlmCtlSimd/CtlSimdReg.h
+@@ -52,6 +52,7 @@
+ #include <typeinfo>
+ #include <CtlExc.h>
+ #include <Iex.h>
++#include <memory.h>
+ 
+ //-----------------------------------------------------------------------------
+ //

pkgs/development/libraries/openexr/default.nix

@@ -12,4 +12,5 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
   propagatedBuildInputs = [pkgconfig zlib ilmbase];
   configureFlags = "--enable-imfexamples";
+  patches = [ ./stringh.patch ];
 }

pkgs/development/libraries/openexr/stringh.patch

@@ -0,0 +1,25 @@
+diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp
+index c5afcc5..5e993b3 100644
+--- a/exrenvmap/main.cpp
++++ b/exrenvmap/main.cpp
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <exception>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ using namespace Imf;
+ using namespace std;
+diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp
+index 5ce4e95..f93ec08 100644
+--- a/exrmaketiled/main.cpp
++++ b/exrmaketiled/main.cpp
+@@ -44,7 +44,7 @@
+ 
+ #include <iostream>
+ #include <exception>
+-#include <string>
++#include <string.h>
+ #include <stdlib.h>
+ 
+ using namespace Imf;

pkgs/top-level/all-packages.nix

@@ -2980,7 +2980,8 @@ let
   };
 
   gav = import ../games/gav {
-    inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net;
+    inherit fetchurl SDL SDL_image SDL_mixer SDL_net;
+    stdenv = overrideGCC stdenv gcc41;
   };
 
   gdbm = import ../development/libraries/gdbm {