Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 graphics-libs/freetype2/BUILD     |   25 +++++++++++++++++++++++++
 graphics-libs/freetype2/CONFIGURE |    8 ++++----
 graphics-libs/freetype2/DETAILS   |    2 +-
 graphics-libs/freetype2/HISTORY   |    5 +++++
 4 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit fcb3fb754314a1cf44546d0986a275578bfe0b13
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    graphics-libs/freetype2: version 2.6.4

diff --git a/graphics-libs/freetype2/BUILD b/graphics-libs/freetype2/BUILD
index 5546074..9017fc6 100755
--- a/graphics-libs/freetype2/BUILD
+++ b/graphics-libs/freetype2/BUILD
@@ -1,2 +1,27 @@
+enable_ftoption() (
+  sed -r -i "/$1/s;[*/];;g" include/freetype/config/ftoption.h
+)
+
+disable_ftoption() (
+  sed -r -i "/$1/s;^#define.*;/* & */;" include/freetype/config/ftoption.h
+)
+
+if [[ ${FT2_BYTECODE} == "n" ]]; then
+  disable_ftoption TT_CONFIG_OPTION_BYTECODE_INTERPRETER &&
+  disable_ftoption "TT_CONFIG_OPTION_SUBPIXEL_HINTING[ \t]+2"
+else
+  if [[ ${FT2_SUBPIXEL_HINTING} == "old" ]]; then
+    enable_ftoption "TT_CONFIG_OPTION_SUBPIXEL_HINTING[ \t]+1" &&
+    disable_ftoption "TT_CONFIG_OPTION_SUBPIXEL_HINTING[ \t]+2"
+  elif [[ ${FT2_SUBPIXEL_HINTING} == "both" ]]; then
+    disable_ftoption "TT_CONFIG_OPTION_SUBPIXEL_HINTING[ \t]+2" &&
+    enable_ftoption "TT_CONFIG_OPTION_SUBPIXEL_HINTING[ \t]+\( 1 \| 2 \)"
+  fi
+fi &&
+
+if [[ ${FT2_SUBPIXEL} == "y" ]]; then
+  enable_ftoption FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+fi &&
+
 OPTS+=" $FREETYPE_OPTS --disable-static" &&
 default_build
diff --git a/graphics-libs/freetype2/CONFIGURE 
b/graphics-libs/freetype2/CONFIGURE
index 3be0fd5..59de574 100755
--- a/graphics-libs/freetype2/CONFIGURE
+++ b/graphics-libs/freetype2/CONFIGURE
@@ -1,6 +1,6 @@
 config_query  FT2_BYTECODE "Enable bytecode interpreter?" y &&
 config_query  FT2_SUBPIXEL "Enable LCD subpixel rendering enhancements 
(patented in some countries)?" n &&
-
-if [[ $FT2_SUBPIXEL == y ]]; then
-  config_query_list FT2_FIR_FILTER  "Force fir filtering (reduces color 
bands)?" light legacy none
-fi
+if [[ ${FT2_BYTECODE} == "y" ]]; then
+  config_query_list FT2_SUBPIXEL_HINTING "Choose subpixel hinting method." 
new old both
+fi &&
+persistent_remove FT2_FIR_FILTER
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 5550fd9..17ae425 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=freetype2
-         VERSION=2.6.3
+         VERSION=2.6.4
   SECURITY_PATCH=10
           SOURCE=freetype-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 9787166..cc697da 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,8 @@
+2016-07-06 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.6.4
+       * BUILD, CONFIGURE: adde actual code to reflect user's choices,
+         removed FT2_FIR_FILTER, added subpixel hinting method choice
+
 2016-03-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.6.3
        * BUILD: --disable-static, as it breaks build