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>
This commit is contained in:
Ross Burton 2013-12-06 10:47:37 +00:00 committed by Richard Purdie
parent 2b898fe10b
commit 14c2326d13
2 changed files with 32 additions and 1 deletions

View File

@ -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

View File

@ -8,7 +8,8 @@ PR = "r5"
SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \
file://allow.to.disable.some.features.patch"
file://allow.to.disable.some.features.patch \
file://fix-freetype-includes.patch"
SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e"
SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"