* FreeType updated to 2.4.1. Note that the bytecode interpreter

  patent has expired, so TT_CONFIG_OPTION_BYTECODE_INTERPRETER is now
  the default.  Whether it looks better now is subjective.

svn path=/nixpkgs/branches/x-updates/; revision=22638

1 files changed, 11 insertions, 13 deletions

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index d3814bdb972..cac14642a3f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,31 +1,29 @@
 { stdenv, fetchurl
-, # FreeType supports hinting using a TrueType bytecode interpreter,
-  # as well as sub-pixel rendering.  These are patented by Apple and
-  # Microsoft, respectively, so they are disabled by default.  This
-  # option allows them to be enabled.  See
-  # http://www.freetype.org/patents.html.
+, # FreeType supports sub-pixel rendering.  This is patented by
+  # Microsoft, so it is disabled by default.  This option allows it to
+  # be enabled.  See http://www.freetype.org/patents.html.
   useEncumberedCode ? false
 }:
 
-stdenv.mkDerivation (rec {
-  name = "freetype-2.3.11";
+stdenv.mkDerivation rec {
+  name = "freetype-2.4.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "1j9f3q7vkdhlcxmfhkkyvxmniih2gcsb428v73mfk88qc0g3n0wa";
+    sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5";
   };
 
   configureFlags = "--disable-static";
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode
-    "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1 -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER=1";
+    "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1";
+
+  # The asm for armel is written with the 'asm' keyword.
+  CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "-std=gnu99";
 
   meta = {
     description = "A font rendering engine";
     homepage = http://www.freetype.org/;
     license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
   };
-} //
-# The asm for armel is written with the 'asm' keyword.
-(if (stdenv.system == "armv5tel-linux") then 
-    {CFLAGS = "-std=gnu99";} else {}))
+}
\ No newline at end of file