diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-12-06 10:47:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-06 13:37:59 +0000 |
| commit | bedaf81dc045c4b222cdf586a4ec901c4e1d08f8 (patch) | |
| tree | 23434c6a33857b06d43edcd78d6e224620d33f12 | |
| parent | 496adfe84ef05d031444988d41451a018133f5a8 (diff) | |
| download | openembedded-core-bedaf81dc045c4b222cdf586a4ec901c4e1d08f8.tar.gz openembedded-core-bedaf81dc045c4b222cdf586a4ec901c4e1d08f8.tar.bz2 openembedded-core-bedaf81dc045c4b222cdf586a4ec901c4e1d08f8.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-imaging_1.1.7.bb | 3 |
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 @@ +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 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" 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" |