summaryrefslogtreecommitdiffstats
path: root/meta
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
parent2b898fe10bbbf2dbc9d7a3dacdd7d66e81f28c95 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch30
-rw-r--r--meta/recipes-devtools/python/python-imaging_1.1.7.bb3
2 files changed, 32 insertions, 1 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 0000000000..9ecc63a0d6
--- /dev/null
+++ b/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001
5From: Andrew Stromnov <stromnov@gmail.com>
6Date: Thu, 28 Nov 2013 16:58:43 +0400
7Subject: [PATCH] fix compiling with FreeType 2.5.1
8
9---
10 _imagingft.c | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/_imagingft.c b/_imagingft.c
14index 47d50bd..f19555b 100644
15--- a/_imagingft.c
16+++ b/_imagingft.c
17@@ -59,7 +59,11 @@ struct {
18 const char* message;
19 } ft_errors[] =
20
21+#if defined(USE_FREETYPE_2_1)
22+#include FT_ERRORS_H
23+#else
24 #include <freetype/fterrors.h>
25+#endif
26
27 /* -------------------------------------------------------------------- */
28 /* font objects */
29--
301.8.5.1
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index e100358d08..efc57cfabc 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -8,7 +8,8 @@ PR = "r5"
8 8
9SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ 9SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
10 file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \ 10 file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \
11 file://allow.to.disable.some.features.patch" 11 file://allow.to.disable.some.features.patch \
12 file://fix-freetype-includes.patch"
12 13
13SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e" 14SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e"
14SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" 15SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"