blender update to 2.48

adding some patches to compile dependencies and gav

svn path=/nixpkgs/trunk/; revision=15474
This commit is contained in:
Marc Weber
2009-05-06 16:06:36 +00:00
parent b5e67e699b
commit 16ca65b0c2
6 changed files with 60 additions and 5 deletions

View File

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

View File

@@ -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>
//-----------------------------------------------------------------------------
//

View File

@@ -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 ];
}

View File

@@ -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;