diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-02 13:47:37 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-02 13:47:37 +0000 |
commit | 55fb51c2d1915df9988ef28eb6c7ea0d9aaae715 (patch) | |
tree | 26efa4536d9bebeff54a3b1dd69b770121ec2c05 /pkgs/development/libraries/ftgl | |
parent | 6975b032b1aa2c6cd39941ae32231dfde11fc330 (diff) |
Updating opencascade to 6.5.2.
I had to bring an older ftgl in. svn path=/nixpkgs/trunk/; revision=32742
Diffstat (limited to 'pkgs/development/libraries/ftgl')
-rw-r--r-- | pkgs/development/libraries/ftgl/2.1.2.nix | 42 | ||||
-rw-r--r-- | pkgs/development/libraries/ftgl/gcc.patch | 13 |
2 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix new file mode 100644 index 0000000000000..121f99e3b03a4 --- /dev/null +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -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 = []; + }; +} diff --git a/pkgs/development/libraries/ftgl/gcc.patch b/pkgs/development/libraries/ftgl/gcc.patch new file mode 100644 index 0000000000000..6e9871476c812 --- /dev/null +++ b/pkgs/development/libraries/ftgl/gcc.patch @@ -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: + /** |