Adding the itk libraries.

Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.

svn path=/nixpkgs/trunk/; revision=20320
This commit is contained in:
Lluís Batlle i Rossell 2010-03-01 23:31:35 +00:00
parent eb047010f8
commit cc068f0be8
4 changed files with 140 additions and 0 deletions

View file

@ -0,0 +1,81 @@
diff --git a/Core/Geometry/Transform.cc b/Core/Geometry/Transform.cc
index 4f16fdc..0da4679 100644
--- a/Core/Geometry/Transform.cc
+++ b/Core/Geometry/Transform.cc
@@ -28,6 +28,7 @@
#include <cassert>
#include <cstring>
+#include <cstdio>
#include <Core/Util/TypeDescription.h>
#include <Core/Geometry/Transform.h>
diff --git a/Core/Util/FullFileName.cc b/Core/Util/FullFileName.cc
index 7a2cad7..7710e92 100644
--- a/Core/Util/FullFileName.cc
+++ b/Core/Util/FullFileName.cc
@@ -29,6 +29,7 @@
#include <Core/Util/FullFileName.h>
#include <iostream>
+#include <cstdio>
namespace SCIRun {
diff --git a/Externals/particle-system-mm/src/sizingfield/LFS.cxx b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
index d1fa5aa..a5a4358 100644
--- a/Externals/particle-system-mm/src/sizingfield/LFS.cxx
+++ b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
@@ -1,5 +1,6 @@
#include <cstdlib>
#include <iostream>
+#include <cstdio>
#include <LFS.h>
using namespace std;
diff --git a/Externals/slivr/Point.cc b/Externals/slivr/Point.cc
index d3be03e..ed4e503 100644
--- a/Externals/slivr/Point.cc
+++ b/Externals/slivr/Point.cc
@@ -42,6 +42,7 @@
#include <slivr/Point.h>
#include <slivr/Vector.h>
#include <iostream>
+#include <cstdio>
namespace SLIVR {
diff --git a/Externals/slivr/Transform.cc b/Externals/slivr/Transform.cc
index c0a4430..520179f 100644
--- a/Externals/slivr/Transform.cc
+++ b/Externals/slivr/Transform.cc
@@ -47,6 +47,7 @@
#include <math.h>
#include <string.h>
#include <iostream>
+#include <cstdio>
using namespace SLIVR;
using namespace std;
diff --git a/Externals/slivr/Vector.cc b/Externals/slivr/Vector.cc
index 8370d65..8b04bb9 100644
--- a/Externals/slivr/Vector.cc
+++ b/Externals/slivr/Vector.cc
@@ -43,6 +43,7 @@
#include <slivr/Point.h>
#include <assert.h>
#include <iostream>
+#include <cstdio>
using std::istream;
using std::ostream;
diff --git a/Externals/vispack/src/image/imagefile.txx b/Externals/vispack/src/image/imagefile.txx
index ced2590..13a32b2 100644
--- a/Externals/vispack/src/image/imagefile.txx
+++ b/Externals/vispack/src/image/imagefile.txx
@@ -1,3 +1,5 @@
+#include <cstdio>
+
template <class T>
int write_raw(const char* name, const VISImage<T>& im)
{

View file

@ -0,0 +1,25 @@
{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu }:
stdenv.mkDerivation {
name = "seg3d-1.12";
src = fetchurl {
url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
};
patches = [ ./cstdio.patch ];
cmakeFlags = [ "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so"
"-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so" ];
preBuild = ''
export LD_LIBRARY_PATH=`pwd`/lib
'';
preUnpack = ''
set -x
sourceRoot=`pwd`/src
'';
buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu ];
}

View file

@ -0,0 +1,24 @@
{stdenv, fetchurl, cmake, libX11, libuuid}:
stdenv.mkDerivation rec {
name = "itk-3.16.0";
src = fetchurl {
url = mirror://sourceforge/itk/InsightToolkit-3.16.0.tar.gz;
sha256 = "18r021ib2g94qlajjsny0r6cpc61rmr0zrpb2l0mx1y7j9ckr6ks";
};
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
# makeFlags = [ "VERBOSE=1" ];
buildInputs = [ cmake libX11 libuuid ];
meta = {
description = "Insight Segmentation and Registration Toolkit";
homepage = http://www.itk.org/;
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -4015,6 +4015,11 @@ let
inherit stdenv fetchurl gettext python;
};
itk = import ../development/libraries/itk {
inherit stdenv fetchurl cmake libuuid;
inherit (xlibs) libX11;
};
jamp = builderDefsPackage ../games/jamp {
inherit mesa SDL SDL_image SDL_mixer;
};
@ -7948,6 +7953,11 @@ let
qt = qt3;
};
seg3d = import ../applications/graphics/seg3d {
inherit fetchurl stdenv cmake wxGTK itk mesa zlib;
inherit (xlibs) libXft libXext libXi libXmu;
};
skype_linux = import ../applications/networking/skype {
inherit fetchurl stdenv;
inherit alsaLib freetype fontconfig zlib;