summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-06 10:47:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-06 13:54:23 +0000
commit14c2326d13338522e4e93b9e1fca9a990d8377cd (patch)
treef417f68363e3fb8a51f2a262effefb64d001f888 /meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
parent2b898fe10bbbf2dbc9d7a3dacdd7d66e81f28c95 (diff)
downloadast2050-yocto-poky-14c2326d13338522e4e93b9e1fca9a990d8377cd.zip
ast2050-yocto-poky-14c2326d13338522e4e93b9e1fca9a990d8377cd.tar.gz
python-imaging: fix compilation with Freetype 2.5.1
Take a patch from the Pillow "friendly fork" to fix compilation with Freetype 2.5.1. (From OE-Core rev: bedaf81dc045c4b222cdf586a4ec901c4e1d08f8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch')
-rw-r--r--meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
new file mode 100644
index 0000000..9ecc63a
--- /dev/null
+++ b/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001
+From: Andrew Stromnov <stromnov@gmail.com>
+Date: Thu, 28 Nov 2013 16:58:43 +0400
+Subject: [PATCH] fix compiling with FreeType 2.5.1
+
+---
+ _imagingft.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/_imagingft.c b/_imagingft.c
+index 47d50bd..f19555b 100644
+--- a/_imagingft.c
++++ b/_imagingft.c
+@@ -59,7 +59,11 @@ struct {
+ const char* message;
+ } ft_errors[] =
+
++#if defined(USE_FREETYPE_2_1)
++#include FT_ERRORS_H
++#else
+ #include <freetype/fterrors.h>
++#endif
+
+ /* -------------------------------------------------------------------- */
+ /* font objects */
+--
+1.8.5.1
OpenPOWER on IntegriCloud