freetype: upgraded to 2.6.1-r1
There's one more patch to take in our build after FreeType 2.6.1 was released.
The upstream 2.6.1-r1 has it so we're upgrading to it.
See the bug for details. (comment #20).
BUG=chromium:534621
TEST=`emerge-{BOARD} freetype` on x86-generic, daisy, link
Change-Id: I7f015687bc7c4277e58fdbe1a327b1f278a94f24
Reviewed-on: https://chromium-review.googlesource.com/304629
Commit-Ready: Jungshik Shin <jshin@chromium.org>
Tested-by: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
new file mode 100644
index 0000000..c361baf
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
@@ -0,0 +1,50 @@
+taken from upstream
+
+http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118
+
+From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl@gnu.org>
+Date: Sun, 4 Oct 2015 13:08:08 +0200
+Subject: [PATCH] [base] Replace left shifts with multiplication (#46118).
+
+* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
+---
+ ChangeLog | 6 ++++++
+ src/base/ftglyph.c | 14 +++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
+index cb7fc37..2778743 100644
+--- a/src/base/ftglyph.c
++++ b/src/base/ftglyph.c
+@@ -125,10 +125,10 @@
+ FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph;
+
+
+- cbox->xMin = glyph->left << 6;
+- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
+- cbox->yMax = glyph->top << 6;
+- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
++ cbox->xMin = glyph->left * 64;
++ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );
++ cbox->yMax = glyph->top * 64;
++ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );
+ }
+
+
+@@ -403,9 +403,9 @@
+ if ( error )
+ goto Exit;
+
+- /* copy advance while converting it to 16.16 format */
+- glyph->advance.x = slot->advance.x << 10;
+- glyph->advance.y = slot->advance.y << 10;
++ /* copy advance while converting 26.6 to 16.16 format */
++ glyph->advance.x = slot->advance.x * 1024;
++ glyph->advance.y = slot->advance.y * 1024;
+
+ /* now import the image from the glyph slot */
+ error = clazz->glyph_init( glyph, slot );
+--
+2.5.2
+
diff --git a/media-libs/freetype/freetype-2.6.1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild
similarity index 97%
rename from media-libs/freetype/freetype-2.6.1.ebuild
rename to media-libs/freetype/freetype-2.6.1-r1.ebuild
index ae71703..01c194d 100644
--- a/media-libs/freetype/freetype-2.6.1.ebuild
+++ b/media-libs/freetype/freetype-2.6.1-r1.ebuild
@@ -58,7 +58,7 @@
epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
if use infinality; then
- epatch ${WORKDIR}/${INFINALITY_PATCH}
+ epatch "${WORKDIR}/${INFINALITY_PATCH}"
# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
@@ -80,6 +80,7 @@
fi
epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+ epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch
if use utils; then
cd "${WORKDIR}/ft2demos-${PV}" || die
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index ed6ed08..d93cdef 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -20,6 +20,7 @@
<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
<flag name="auto-hinter">Use the unpatented auto-hinter instead
of the (recommended) TrueType bytecode interpreter</flag>
+ <flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
<flag name="fontforge">Install internal headers required for TrueType
debugger in <pkg>media-gfx/fontforge</pkg> (built with
diff --git a/metadata/md5-cache/media-libs/freetype-2.6.1 b/metadata/md5-cache/media-libs/freetype-2.6.1-r1
similarity index 98%
rename from metadata/md5-cache/media-libs/freetype-2.6.1
rename to metadata/md5-cache/media-libs/freetype-2.6.1-r1
index 7316cc4..53890fc 100644
--- a/metadata/md5-cache/media-libs/freetype-2.6.1
+++ b/metadata/md5-cache/media-libs/freetype-2.6.1-r1
@@ -12,4 +12,4 @@
SLOT=2
SRC_URI=mirror://sourceforge/freetype/freetype-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-2.6.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.1.tar.bz2 ) infinality? ( https://dev.gentoo.org/~polynomial-c/03-infinality-2.6-2015.10.04.patch.xz )
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils 3727db64c7b960903d5033280f108080 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=ebec909ac3e540120d6567c618b322a0
+_md5_=a7347d92543531c91b854ec1965daf7b
