[oe] [PATCH] freetype 2.3.5/2.3.6: Import GetDescender() fix from Savannah from ftcalc.c 1.79 for bug report #23556.

Marc Olzheim zlo at zlo.nu
Thu Apr 1 11:12:55 UTC 2010


From: Marc Olzheim <marc at iphion.nl>

This was fixed by freetype a month after the release of 2.3.6.
---
 .../freetype-2.3.5/ftcalc_getdescender.patch       |   13 +++++++++++++
 .../freetype-2.3.6/ftcalc_getdescender.patch       |   13 +++++++++++++
 recipes/freetype/freetype_2.3.5.bb                 |    3 ++-
 recipes/freetype/freetype_2.3.6.bb                 |    3 ++-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 recipes/freetype/freetype-2.3.5/ftcalc_getdescender.patch
 create mode 100644 recipes/freetype/freetype-2.3.6/ftcalc_getdescender.patch

diff --git a/recipes/freetype/freetype-2.3.5/ftcalc_getdescender.patch b/recipes/freetype/freetype-2.3.5/ftcalc_getdescender.patch
new file mode 100644
index 0000000..3311343
--- /dev/null
+++ b/recipes/freetype/freetype-2.3.5/ftcalc_getdescender.patch
@@ -0,0 +1,13 @@
+--- freetype-2.3.5/src/base/ftcalc.c	2007-06-11 07:51:49.000000000 +0200
++++ freetype-2.3.5/src/base/ftcalc.c	2008-06-28 00:14:23.000000000 +0200
+@@ -430,8 +430,8 @@
+       "shll  $16, %%edx\n"
+       "addl  %%edx, %%eax\n"
+       "mov   %%eax, %0\n"
+-      : "=r"(result)
+-      : "a"(a), "d"(b)
++      : "=a"(result), "+d"(b)
++      : "a"(a)
+       : "%ecx"
+     );
+     return result;
diff --git a/recipes/freetype/freetype-2.3.6/ftcalc_getdescender.patch b/recipes/freetype/freetype-2.3.6/ftcalc_getdescender.patch
new file mode 100644
index 0000000..a1ede28
--- /dev/null
+++ b/recipes/freetype/freetype-2.3.6/ftcalc_getdescender.patch
@@ -0,0 +1,13 @@
+--- freetype-2.3.6/src/base/ftcalc.c	2008-05-08 22:44:41.000000000 +0200
++++ freetype-2.3.6/src/base/ftcalc.c	2008-06-28 00:14:23.000000000 +0200
+@@ -430,8 +430,8 @@
+       "shll  $16, %%edx\n"
+       "addl  %%edx, %%eax\n"
+       "mov   %%eax, %0\n"
+-      : "=r"(result)
+-      : "a"(a), "d"(b)
++      : "=a"(result), "+d"(b)
++      : "a"(a)
+       : "%ecx"
+     );
+     return result;
diff --git a/recipes/freetype/freetype_2.3.5.bb b/recipes/freetype/freetype_2.3.5.bb
index 596d191..a6944ff 100644
--- a/recipes/freetype/freetype_2.3.5.bb
+++ b/recipes/freetype/freetype_2.3.5.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+           file://ftcalc_getdescender.patch;patch=1 \
            file://fix-x86_64-build.patch;patch=1 \
            file://no-hardcode.patch;patch=1 \
 	  "
diff --git a/recipes/freetype/freetype_2.3.6.bb b/recipes/freetype/freetype_2.3.6.bb
index 0ee2414..e84cacf 100644
--- a/recipes/freetype/freetype_2.3.6.bb
+++ b/recipes/freetype/freetype_2.3.6.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+  file://ftcalc_getdescender.patch;patch=1 \
   file://no-hardcode.patch;patch=1 \
   file://fix-configure.patch;patch=1 \
   file://libtool-tag.patch;patch=1 \
-- 
1.6.3.3





More information about the Openembedded-devel mailing list