ftgl212: delete

It is no longer used and ftgl 2.1.3 is newer.
wip/yesman
Orivej Desh 7 years ago
parent 676b2ef431
commit 90ab4ef5a8
  1. 44
      pkgs/development/libraries/ftgl/2.1.2.nix
  2. 13
      pkgs/development/libraries/ftgl/gcc.patch
  3. 4
      pkgs/top-level/all-packages.nix

@ -1,44 +0,0 @@
{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];
NIX_LDFLAGS = "-lGLU -lGL";
patches = [ ./gcc.patch ];
configureFlags = "--enable-shared";
preConfigure = ''
cd unix
cd docs
tar vxf ../../docs/html.tar.gz
cd ..
'';
meta = {
homepage = https://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 = [];
};
}

@ -1,13 +0,0 @@
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:
/**

@ -2164,8 +2164,6 @@ with pkgs;
ftgl = callPackage ../development/libraries/ftgl { };
ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
ftop = callPackage ../os-specific/linux/ftop { };
fsfs = callPackage ../tools/filesystems/fsfs { };
@ -10089,7 +10087,7 @@ with pkgs;
olm = callPackage ../development/libraries/olm { };
oneko = callPackage ../applications/misc/oneko { };
oneko = callPackage ../applications/misc/oneko { };
oniguruma = callPackage ../development/libraries/oniguruma { };

Loading…
Cancel
Save