Author: viric
Date: Fri Mar 2 13:47:37 2012
New Revision: 32742
URL: https://nixos.org/websvn/nix/?rev=32742&sc=1
Log:
Updating opencascade to 6.5.2.
I had to bring an older ftgl in.
Added:
nixpkgs/trunk/pkgs/development/libraries/ftgl/2.1.2.nix
nixpkgs/trunk/pkgs/development/libraries/ftgl/gcc.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/opencascade/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/ftgl/2.1.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ftgl/2.1.2.nix Fri Mar 2
13:47:37 2012 (r32742)
@@ -0,0 +1,42 @@
+{stdenv, fetchurl, freetype, mesa}:
+
+let
+ name = "ftgl-2.1.2";
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/ftgl/${name}.tar.gz";
+ sha256 = "0xa00fnn6wd3rnkrkcs1wpv21lxdsb83r4hjn3l33dn0zbawnn97";
+ };
+
+ buildInputs = [freetype mesa];
+
+ patches = [ ./gcc.patch ];
+
+ configureFlags = "--enable-shared";
+
+ preConfigure = ''
+ cd unix
+ cd docs
+ tar vxf ../../docs/html.tar.gz
+ cd ..
+ '';
+
+ meta = {
+ homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";;
+ description = "font rendering library for OpenGL applications";
+ license = stdenv.lib.licenses.gpl3Plus;
+
+ longDescription = ''
+ FTGL is a free cross-platform Open Source C++ library that uses
+ Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
+ supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
+ and extruded polygon rendering modes.
+ '';
+
+ platforms = stdenv.lib.platforms.gnu;
+ maintainers = [];
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/ftgl/gcc.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ftgl/gcc.patch Fri Mar 2
13:47:37 2012 (r32742)
@@ -0,0 +1,13 @@
+diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
+index c263f72..8959cb3 100755
+--- a/include/FTTextureGlyph.h
++++ b/include/FTTextureGlyph.h
+@@ -52,7 +52,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
+ * Reset the currently active texture to zero to get into a known
state before
+ * drawing a string. This is to get round possible threading issues.
+ */
+- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID =
0;}
++ static void ResetActiveTexture(){ activeTextureID = 0;}
+
+ private:
+ /**
Modified: nixpkgs/trunk/pkgs/development/libraries/opencascade/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/opencascade/default.nix Fri Mar
2 13:31:12 2012 (r32741)
+++ nixpkgs/trunk/pkgs/development/libraries/opencascade/default.nix Fri Mar
2 13:47:37 2012 (r32742)
@@ -1,18 +1,25 @@
-{stdenv, fetchurl, mesa, tcl, tk, file, libXmu}:
+{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool,
qt4,
+ftgl, freetype}:
stdenv.mkDerivation rec {
- name = "opencascade-6.3.0";
+ name = "opencascade-6.5.2";
src = fetchurl {
- url = http://files.opencascade.com/OCC_6.3_release/OpenCASCADE_src.tgz;
- md5 = "52778127974cb3141c2827f9d40d1f11";
+ url =
http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
+ sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
};
- buildInputs = [ mesa tcl tk file libXmu ];
+ buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl
freetype ];
+
+ preUnpack = ''
+ sourceRoot=`pwd`/ros
+ '';
preConfigure = ''
- cd ros
+ sh ./build_configure
'';
+ NIX_CFLAGS_COMPILE = "-I${ftgl}/include/FTGL
-I${freetype}/include/freetype2";
+
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
postInstall = ''
@@ -21,6 +28,8 @@
cp -R ../doc $out/share/doc/${name}
'';
+ enableParallelBuilding = true;
+
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and
numerical simulation";
homepage = http://www.opencascade.org/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 2 13:31:12
2012 (r32741)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 2 13:47:37
2012 (r32742)
@@ -700,6 +700,8 @@
ftgl = callPackage ../development/libraries/ftgl { };
+ ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
+
fuppes = callPackage ../tools/networking/fuppes {
ffmpeg = ffmpeg_0_6_90;
};
@@ -4446,7 +4448,9 @@
openbabel = callPackage ../development/libraries/openbabel { };
- opencascade = callPackage ../development/libraries/opencascade { };
+ opencascade = callPackage ../development/libraries/opencascade {
+ ftgl = ftgl212;
+ };
opencsg = callPackage ../development/libraries/opencsg { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
