Fix building with newer freetype versions #179734 by Elliott Sales de Andrade.

Package-Manager: portage-2.1.2.9

4 files changed, 82 insertions, 17 deletions

diff --git a/media-libs/amanith/ChangeLog b/media-libs/amanith/ChangeLog
index cb1bc1d7a621..3eecf8df1741 100644
--- a/media-libs/amanith/ChangeLog
+++ b/media-libs/amanith/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/amanith
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/ChangeLog,v 1.2 2006/11/11 00:47:33 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/ChangeLog,v 1.3 2007/06/11 04:40:45 vapier Exp $
+
+  11 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/amanith-0.3-freetype.patch, amanith-0.3-r1.ebuild:
+  Fix building with newer freetype versions #179734 by Elliott Sales de Andrade.
 
 *amanith-0.3-r1 (11 Nov 2006)
 
diff --git a/media-libs/amanith/Manifest b/media-libs/amanith/Manifest
index 065c545cbd0e..c744c1423ea9 100644
--- a/media-libs/amanith/Manifest
+++ b/media-libs/amanith/Manifest
@@ -5,19 +5,23 @@ AUX amanith-0.3-build.patch 1606 RMD160 068f1d7e9e95f106a2a0c18cd26757ec594b54d1
 MD5 bd747277a712e75188ff3ae2f7b3c6a7 files/amanith-0.3-build.patch 1606
 RMD160 068f1d7e9e95f106a2a0c18cd26757ec594b54d1 files/amanith-0.3-build.patch 1606
 SHA256 81af009afe75284631313de813dcc2b8c2fbbf1ec44112f70e463d5fe5f34edc files/amanith-0.3-build.patch 1606
+AUX amanith-0.3-freetype.patch 2137 RMD160 cea5148dbc9ee2cb90931258bb2998cd619dcaca SHA1 513297d0c095ec05894621f19968271bf33c69b2 SHA256 07beab5492ac9c542c9268200433e99ce9a28f18df3f6d237c1d62c2a1ddc9b0
+MD5 ba4560457259b7ddc736af24e4868e50 files/amanith-0.3-freetype.patch 2137
+RMD160 cea5148dbc9ee2cb90931258bb2998cd619dcaca files/amanith-0.3-freetype.patch 2137
+SHA256 07beab5492ac9c542c9268200433e99ce9a28f18df3f6d237c1d62c2a1ddc9b0 files/amanith-0.3-freetype.patch 2137
 AUX amanith-0.3-gcc4.patch 252 RMD160 2091c0f8f453f5868adf18d2500880e3fff622c3 SHA1 ab3c16309bb4d7e18d0db678d8d27439bc9e08ef SHA256 021603dff71d331772e52385b31709396ff6a54d60e8e835b65eeb4a1504e032
 MD5 abc257bd40ecf537c83a19f6559e407a files/amanith-0.3-gcc4.patch 252
 RMD160 2091c0f8f453f5868adf18d2500880e3fff622c3 files/amanith-0.3-gcc4.patch 252
 SHA256 021603dff71d331772e52385b31709396ff6a54d60e8e835b65eeb4a1504e032 files/amanith-0.3-gcc4.patch 252
 DIST amanith_03.tar.gz 7688202 RMD160 6bfe1f54bbf3ff70b299c5ebf9d2d13cfcfaa6fd SHA1 7bc3ab197a227d3dabf1902e420cba36e0a4e903 SHA256 2e92dde6e56abef0f5146fd61ad0310e176d25578673353afe4def99c6bdaa1a
-EBUILD amanith-0.3-r1.ebuild 1805 RMD160 c81d504b5d223653c30894d903010242605f49ee SHA1 fdda38f3153d5721167d5ea6e5ac046a11ed9acd SHA256 99d11a0d9c3f5b7219cd439bdec0c17e7da07f8c5ee57b8f25b8d0948f635ba7
-MD5 66a46422c5d6b09a2f8033ecc0dd4357 amanith-0.3-r1.ebuild 1805
-RMD160 c81d504b5d223653c30894d903010242605f49ee amanith-0.3-r1.ebuild 1805
-SHA256 99d11a0d9c3f5b7219cd439bdec0c17e7da07f8c5ee57b8f25b8d0948f635ba7 amanith-0.3-r1.ebuild 1805
-MISC ChangeLog 494 RMD160 f826f084fdff362b5e077a9edc97d8567ff93815 SHA1 a24b49d62cd49b225a9a004ca99d86755b035f6d SHA256 22ac8bb0ce4797c43f6550d6d0d861a78c25de1c7275ff2d10f7ed18bcd05b83
-MD5 6fec6023759e9f63da47c18bba1a42e1 ChangeLog 494
-RMD160 f826f084fdff362b5e077a9edc97d8567ff93815 ChangeLog 494
-SHA256 22ac8bb0ce4797c43f6550d6d0d861a78c25de1c7275ff2d10f7ed18bcd05b83 ChangeLog 494
+EBUILD amanith-0.3-r1.ebuild 1854 RMD160 971e9c61b0203aac8fbde046a78683530d178c5e SHA1 93a483830d64181393dd6d8af273992f1d9fb20e SHA256 d73e3cc22ce44eee4069807668b278c6aac158c5e2043bfbeee595fa19173a06
+MD5 c4555624fd99e8a789cc2dede6792544 amanith-0.3-r1.ebuild 1854
+RMD160 971e9c61b0203aac8fbde046a78683530d178c5e amanith-0.3-r1.ebuild 1854
+SHA256 d73e3cc22ce44eee4069807668b278c6aac158c5e2043bfbeee595fa19173a06 amanith-0.3-r1.ebuild 1854
+MISC ChangeLog 686 RMD160 0a0aec5d9057940888a2333ef34c4f9e8f0aaf2d SHA1 cfce6964dc653e8b3ffeb053ac6c86adc48ea762 SHA256 35ec38a2c462a6062b7ec323e672023d6e8ccb2fd52951065f5c80e9af4c27a5
+MD5 92758ffdbf4496971c77eed363b1c40e ChangeLog 686
+RMD160 0a0aec5d9057940888a2333ef34c4f9e8f0aaf2d ChangeLog 686
+SHA256 35ec38a2c462a6062b7ec323e672023d6e8ccb2fd52951065f5c80e9af4c27a5 ChangeLog 686
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
 MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
 RMD160 2699c0059639536eb7befa077a27e437569a26ba metadata.xml 221
@@ -26,9 +30,9 @@ MD5 ee09de69ebe3f6d703c2c12470466ce6 files/digest-amanith-0.3-r1 235
 RMD160 4b314d040eb2aeadcf3a963116c8f54645e8084f files/digest-amanith-0.3-r1 235
 SHA256 71e9c87249bc70ca3d58f13667be9195dfb3d7e12a7bc13e64bbadcff01f2dcf files/digest-amanith-0.3-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFVR2uamhnQswr0vIRAkCPAJ97xe4RvPCJDaZZQ5xjXJCykjTIegCfewmm
-tF2qtGvnG4mq49D9mw7jtmw=
-=cKaO
+iD8DBQFGbNJT8bi6rjpTunYRAvE4AKCq1bdV3Gy9hK0bzut8rLkHOrPMVQCgxTeQ
+FzMIQaQVhMK/eBlJja3ZiIg=
+=2N6N
 -----END PGP SIGNATURE-----
diff --git a/media-libs/amanith/amanith-0.3-r1.ebuild b/media-libs/amanith/amanith-0.3-r1.ebuild
index 0293409751e1..af202c83c823 100644
--- a/media-libs/amanith/amanith-0.3-r1.ebuild
+++ b/media-libs/amanith/amanith-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/amanith-0.3-r1.ebuild,v 1.1 2006/11/11 00:47:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/amanith-0.3-r1.ebuild,v 1.2 2007/06/11 04:40:45 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples jpeg opengl png truetype"
 
-DEPEND="truetype? ( >=media-libs/freetype-2.1.10 )
+DEPEND="truetype? ( >=media-libs/freetype-2.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	png? ( >=media-libs/libpng-1.2.10 )
 	opengl? ( media-libs/glew )
@@ -27,6 +27,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-freetype.patch #179734
 
 	rm -rf 3rdpart include/GL || die
 	sed -i -e '/SUBDIRS/s:3rdpart::' amanith.pro || die
diff --git a/media-libs/amanith/files/amanith-0.3-freetype.patch b/media-libs/amanith/files/amanith-0.3-freetype.patch
new file mode 100644
index 000000000000..bd5a93c6bb3e
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-freetype.patch
@@ -0,0 +1,56 @@
+should be fixed upstream already
+
+http://bugs.gentoo.org/179734
+
+--- amarinth/plugins/fonts/fontsimpexp.cpp
++++ amarinth/plugins/fonts/gfontsimpexp.cpp
+@@ -34,7 +34,6 @@
+ 

+ #include <ft2build.h>

+ #include FT_FREETYPE_H

+-#include <freetype/internal/ftgloadr.h>
+ 

+ namespace Amanith {

+ 

+@@ -198,7 +197,8 @@
+ 	GGlyphMetrics tmpMetrics;

+ 	FT_Error error;

+ 	GInt32 i, j, k0, k1, numVert;

+-	FT_SubGlyphRec subGlyph;

++	FT_Matrix subGlyphMatrix;
++	FT_Int subGlyphArg1, subGlyphArg2;
+ 	GPoint2 p;

+ 	GReal x, y;

+ 	GVect<GReal, 2> v;

+@@ -223,19 +223,22 @@
+ 		GDynArray<GSubChar2D> subChars(Face->glyph->num_subglyphs);

+ 

+ 		for (i = 0; i < (GInt32)Face->glyph->num_subglyphs; i++) {

+-			subGlyph = Face->glyph->subglyphs[i];

+-			subChars[i].GlyphIndex = subGlyph.index;

+-			subChars[i].Flags = subGlyph.flags;

++			FT_Get_SubGlyph_Info(Face->glyph, i,
++						&subChars[i].GlyphIndex,
++						(FT_UInt*)&subChars[i].Flags,
++						&subGlyphArg1,
++						&subGlyphArg2,
++						&subGlyphMatrix);
+ 			// rotation and scale

+-			subChars[i].Transformation[G_X][G_X] = Fixed1616ToReal(subGlyph.transform.xx);

+-			subChars[i].Transformation[G_X][G_Y] = Fixed1616ToReal(subGlyph.transform.xy);

++			subChars[i].Transformation[G_X][G_X] = Fixed1616ToReal(subGlyphMatrix.xx);

++			subChars[i].Transformation[G_X][G_Y] = Fixed1616ToReal(subGlyphMatrix.xy);

+ 			// x position

+-			subChars[i].Transformation[G_X][G_Z] = subGlyph.arg1 * Scale;

++			subChars[i].Transformation[G_X][G_Z] = subGlyphArg1 * Scale;

+ 			// rotation and scale

+-			subChars[i].Transformation[G_Y][G_X] = Fixed1616ToReal(subGlyph.transform.yx);

+-			subChars[i].Transformation[G_Y][G_Y] = Fixed1616ToReal(subGlyph.transform.yy);

++			subChars[i].Transformation[G_Y][G_X] = Fixed1616ToReal(subGlyphMatrix.yx);

++			subChars[i].Transformation[G_Y][G_Y] = Fixed1616ToReal(subGlyphMatrix.yy);

+ 			// y position

+-			subChars[i].Transformation[G_Y][G_Z] = subGlyph.arg2 * Scale;

++			subChars[i].Transformation[G_Y][G_Z] = subGlyphArg2 * Scale;

+ 			// last row is an identity

+ 			subChars[i].Transformation[G_Z][G_X] = 0;

+ 			subChars[i].Transformation[G_Z][G_Y] = 0;