Updating meshlab.

Their build system has changed, and the source tree they distribute too, so the
dependencies changed a bit.
To get meshlab working, I update lib3ds and add levmar.

svn path=/nixpkgs/trunk/; revision=19595
This commit is contained in:
Lluís Batlle i Rossell
2010-01-21 14:39:53 +00:00
parent e70276079f
commit a3e4c7640f
5 changed files with 94 additions and 10 deletions

View File

@@ -0,0 +1,28 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "levmar-2.5";
src = fetchurl {
url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz";
sha256 = "0xcx9fvymr0j5kmfy5cqaa2lxf1c64vv25z2a28w43pkxz1nl3xp";
};
patchPhase = ''
sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h
sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile
'';
installPhase = ''
ensureDir $out/include $out/lib
cp lm.h $out/include
cp liblevmar.a $out/lib
'';
meta = {
description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
homepage = http://www.ics.forth.gr/~lourakis/levmar/;
license = "GPLv2+";
};
}

View File

@@ -0,0 +1,37 @@
diff --git a/Makefile b/Makefile
index af70b4c..53c6fab 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,11 @@ DEMOBJS=lmdemo.o
DEMOSRCS=lmdemo.c
AR=ar
RANLIB=ranlib
-LAPACKLIBS=-llapack -lblas -lf2c # comment this line if you are not using LAPACK.
+#LAPACKLIBS=-llapack -lblas -lf2c # comment this line if you are not using LAPACK.
# On systems with a FORTRAN (not f2c'ed) version of LAPACK, -lf2c is
# not necessary; on others, -lf2c is equivalent to -lF77 -lI77
-#LAPACKLIBS=-L/usr/local/atlas/lib -llapack -lcblas -lf77blas -latlas -lf2c # This works with the ATLAS updated lapack and Linux_P4SSE2
+LAPACKLIBS=-llapack -lcblas -lf77blas -latlas -lgfortran # This works with the ATLAS updated lapack and Linux_P4SSE2
# from http://www.netlib.org/atlas/archives/linux/
#LAPACKLIBS=-llapack -lgoto2 -lpthread -lf2c # This works with GotoBLAS
diff --git a/misc.h b/misc.h
index e32f18d..827507e 100644
--- a/misc.h
+++ b/misc.h
@@ -30,11 +30,11 @@
/* f2c'd BLAS */
//#define LM_BLAS_PREFIX f2c_
/* C BLAS */
-//#define LM_BLAS_PREFIX cblas_
+#define LM_BLAS_PREFIX cblas_
/* common suffix for BLAS subroutines */
-//#define LM_BLAS_SUFFIX // define empty if a f2c_ or cblas_ prefix was defined for LM_BLAS_PREFIX above
-#define LM_BLAS_SUFFIX _ // use this in case of no BLAS prefix
+#define LM_BLAS_SUFFIX // define empty if a f2c_ or cblas_ prefix was defined for LM_BLAS_PREFIX above
+//#define LM_BLAS_SUFFIX _ // use this in case of no BLAS prefix
#define LCAT_(a, b) #a b

View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "lib3ds-1.3.0";
src = fetchurl {
url = "mirror://sourceforge/lib3ds/${name}.zip";
url = "http://lib3ds.googlecode.com/files/${name}.zip";
sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
};