[arch-commits] Commit in freetype2/trunk (8 files)
Jan Steffens
heftig at archlinux.org
Thu Sep 8 16:52:27 UTC 2016
Date: Thursday, September 8, 2016 @ 16:52:27
Author: heftig
Revision: 275858
2.7-1
Added:
freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch
freetype2/trunk/freetype2.sh
Modified:
freetype2/trunk/0001-Enable-table-validation-modules.patch
freetype2/trunk/0002-Enable-subpixel-rendering.patch
freetype2/trunk/PKGBUILD
freetype2/trunk/freetype2.install
Deleted:
freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch
freetype2/trunk/0004-Keep-default-interpreter-version-as-35.patch
----------------------------------------------------+
0001-Enable-table-validation-modules.patch | 18 +--
0002-Enable-subpixel-rendering.patch | 10 +-
0003-Enable-infinality-subpixel-hinting.patch | 27 +++++
0003-Make-subpixel-hinting-mode-configurable.patch | 88 -------------------
0004-Keep-default-interpreter-version-as-35.patch | 29 ------
PKGBUILD | 36 +++----
freetype2.install | 15 ---
freetype2.sh | 12 ++
8 files changed, 71 insertions(+), 164 deletions(-)
Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2016-09-08 16:35:49 UTC (rev 275857)
+++ 0001-Enable-table-validation-modules.patch 2016-09-08 16:52:27 UTC (rev 275858)
@@ -1,7 +1,7 @@
-From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001
+From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/4] Enable table validation modules
+Subject: [PATCH 1/3] Enable table validation modules
---
modules.cfg | 4 ++--
@@ -8,22 +8,22 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index d677565a2bc2b5a2..f19cbec33384a86f 100644
+index f30049c38cc45159..7b8e50fe1b34584a 100644
--- a/modules.cfg
+++ b/modules.cfg
-@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
- AUX_MODULES += cache
-
+@@ -120,7 +120,7 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
-@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
-
+@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
# OpenType table validation. Needs ftotval.c below.
#
+ # No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
@@ -30,5 +30,5 @@
# Auxiliary PostScript driver component to share common code.
#
--
-2.9.0
+2.9.3
Modified: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2016-09-08 16:35:49 UTC (rev 275857)
+++ 0002-Enable-subpixel-rendering.patch 2016-09-08 16:52:27 UTC (rev 275858)
@@ -1,7 +1,7 @@
-From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001
+From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/4] Enable subpixel rendering
+Subject: [PATCH 2/3] Enable subpixel rendering
---
include/freetype/config/ftoption.h | 2 +-
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 2556c64d9d6c0838..8e58403529f597e5 100644
+index 90c123ef93e9ea04..67a361dd41e0b026 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
@@ -21,5 +21,5 @@
/*************************************************************************/
--
-2.9.0
+2.9.3
Added: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2016-09-08 16:52:27 UTC (rev 275858)
@@ -0,0 +1,27 @@
+From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/3] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 67a361dd41e0b026..c4812862518b66a6 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
+ /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+ /* */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /*************************************************************************/
+--
+2.9.3
+
Deleted: 0003-Make-subpixel-hinting-mode-configurable.patch
===================================================================
--- 0003-Make-subpixel-hinting-mode-configurable.patch 2016-09-08 16:35:49 UTC (rev 275857)
+++ 0003-Make-subpixel-hinting-mode-configurable.patch 2016-09-08 16:52:27 UTC (rev 275858)
@@ -1,88 +0,0 @@
-From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 15 Jun 2016 14:10:20 +0200
-Subject: [PATCH 3/4] Make subpixel hinting mode configurable
-
----
- include/freetype/config/ftoption.h | 2 +-
- src/truetype/ttobjs.c | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 8e58403529f597e5..197e15cdc3cc1e74 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -632,7 +632,7 @@ FT_BEGIN_HEADER
- /* */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /*************************************************************************/
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index ed3be2dbee79427c..d89f92e94d0e816b 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -36,6 +36,9 @@
- #include "ttgxvar.h"
- #endif
-
-+#include <stdlib.h>
-+#include <errno.h>
-+
- /*************************************************************************/
- /* */
- /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
-@@ -1286,6 +1289,7 @@
- #ifdef TT_USE_BYTECODE_INTERPRETER
-
- TT_Driver driver = (TT_Driver)ttdriver;
-+ const char *envval;
-
- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-@@ -1295,6 +1299,39 @@
- driver->interpreter_version = TT_INTERPRETER_VERSION_40;
- #endif
-
-+ errno = 0;
-+ envval = getenv( "FT2_SUBPIXEL_HINTING" );
-+ if ( envval )
-+ {
-+ char *endptr = NULL;
-+ unsigned long value = strtoul( envval, &endptr, 10 );
-+
-+ if ( !errno && endptr && !*endptr )
-+ {
-+ switch( value )
-+ {
-+ case 0:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+ break;
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-+ case 1:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+ break;
-+#endif
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-+ case 2:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_40;
-+ break;
-+#endif
-+
-+ default:
-+ break;
-+ }
-+ }
-+ }
-+
- #else /* !TT_USE_BYTECODE_INTERPRETER */
-
- FT_UNUSED( ttdriver );
---
-2.9.0
-
Deleted: 0004-Keep-default-interpreter-version-as-35.patch
===================================================================
--- 0004-Keep-default-interpreter-version-as-35.patch 2016-09-08 16:35:49 UTC (rev 275857)
+++ 0004-Keep-default-interpreter-version-as-35.patch 2016-09-08 16:52:27 UTC (rev 275858)
@@ -1,29 +0,0 @@
-From 88e7474320b8d2b5333e276b8b1771bc2690c43f Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 12 Jul 2016 12:47:57 +0200
-Subject: [PATCH 4/4] Keep default interpreter version as 35
-
----
- src/truetype/ttobjs.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index d89f92e94d0e816b..efca66fc21c0287a 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -1292,12 +1292,6 @@
- const char *envval;
-
- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
--#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
--#endif
--#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-- driver->interpreter_version = TT_INTERPRETER_VERSION_40;
--#endif
-
- errno = 0;
- envval = getenv( "FT2_SUBPIXEL_HINTING" );
---
-2.9.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-08 16:35:49 UTC (rev 275857)
+++ PKGBUILD 2016-09-08 16:52:27 UTC (rev 275858)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=freetype2
-pkgver=2.6.5
-pkgrel=2
+pkgver=2.7
+pkgrel=1
pkgdesc="TrueType font rendering library"
arch=(i686 x86_64)
license=('GPL')
@@ -20,20 +20,20 @@
http://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
- 0003-Make-subpixel-hinting-mode-configurable.patch
- 0004-Keep-default-interpreter-version-as-35.patch
- 0005-freetype-2.5.2-more-demos.patch)
-sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201'
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0005-freetype-2.5.2-more-demos.patch
+ freetype2.sh)
+sha1sums=('f251029d5ab542a96dd4531605fe577185077560'
'SKIP'
- 'e62cc983baf103b111f7608ee1b06f12b1774a1c'
+ '22949e7c809d7d5931331ca54da30e4d195669ea'
'SKIP'
- '6562596b3fc8c18a7beb5509b2e4a7daf7ee1d48'
+ 'b7f7633ca0b828ca319afdd09a81b42592685d9c'
'SKIP'
- 'e1fde7854d2a64868a5eef07415ad23c339fc630'
- '7da3af8e1e002e39a247c37a05a10beb576007d6'
- 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb'
- '1f30feeba9c51c9ec745bd29ef07beccf9544338'
- '72cfecbe738085eec475e012617661ad0cc9b76f')
+ 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
+ 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
+ '41d27140fd590945e22e012c9dce62de3d6f11e6'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare() {
@@ -43,15 +43,8 @@
cd freetype2
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
- # Provide a way to set the default subpixel hinting mode
- # at runtime, without depending on the application to do so.
- patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch
-
- # Keep the classic subpixel hinting mode as default, as expected
- # by upstream for the 2.6 series
- patch -Np1 -i ../0004-Keep-default-interpreter-version-as-35.patch
-
cd ../ft2demos-${pkgver}
# enable more demos
patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
@@ -78,6 +71,7 @@
package() {
cd freetype2
make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
# Package docs
install -dm755 "${pkgdir}/usr/share/doc"
Modified: freetype2.install
===================================================================
--- freetype2.install 2016-09-08 16:35:49 UTC (rev 275857)
+++ freetype2.install 2016-09-08 16:52:27 UTC (rev 275858)
@@ -1,17 +1,8 @@
-post_install() {
- post_upgrade $1 0
-}
-
post_upgrade() {
- if (( $(vercmp $2 2.6.5-1) < 0 )); then
+ if (( $(vercmp $2 2.7.0-1) < 0 )); then
cat <<MSG
- Subpixel hinting mode can be chosen by setting the right value in
- your environment, for example /etc/environment or ~/.pam_environment .
-
- Available settings:
- FT2_SUBPIXEL_HINTING=0 # Classic mode (default in 2.6)
- FT2_SUBPIXEL_HINTING=1 # Infinality mode
- FT2_SUBPIXEL_HINTING=2 # Minimal mode (default in 2.7)
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
MSG
fi
}
Added: freetype2.sh
===================================================================
--- freetype2.sh (rev 0)
+++ freetype2.sh 2016-09-08 16:52:27 UTC (rev 275858)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
More information about the arch-commits
mailing list