summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-04 15:35:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 14:25:28 +0000
commit7df2cfcfa47993f8bf641691a20b1da1fd363ca4 (patch)
treeacc37abec472d9c1a591cc51daec53245b42ad35 /meta/recipes-graphics
parentb9f9c29c92980177673299f5ed551f89c132a7b8 (diff)
downloadpoky-7df2cfcfa47993f8bf641691a20b1da1fd363ca4.tar.gz
libxft: fix Freetype header inclusion
Freetype 2.5.1 changes the location of the header files but as directly including the files isn't recommended they don't see this as a problem. Change libxft to use the recommended macros instead of direct inclusion, to fix the compilation. (From OE-Core rev: dbefa64dda9b0d5f12b37e3ef21831d78663afa6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libxft/freetype.patch39
-rw-r--r--meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb8
2 files changed, 44 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxft/freetype.patch b/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
new file mode 100644
index 0000000000..9f1aa21bac
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From f568fa5a8220fd06659c0f26a93adcc81a42917c Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 2 Dec 2013 13:48:40 +0000
7Subject: [PATCH] xftglyphs: use recommend freetype inclusion
8
9FreeType recommends to use their special macros to include the headers, because
10it gives them the ability to move headers around. They did this in 2.5.1 (yes,
11a point release) and this direct inclusion doesn't work anymore.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 src/xftglyphs.c | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
17
18diff --git a/src/xftglyphs.c b/src/xftglyphs.c
19index 2f3dc5a..53302f0 100644
20--- a/src/xftglyphs.c
21+++ b/src/xftglyphs.c
22@@ -21,10 +21,10 @@
23 */
24
25 #include "xftint.h"
26-#include <freetype/ftoutln.h>
27-#include <freetype/ftlcdfil.h>
28-
29-#include <freetype/ftsynth.h>
30+#include <ft2build.h>
31+#include FT_FREETYPE_H
32+#include FT_LCD_FILTER_H
33+#include FT_SYNTHESIS_H
34
35 /*
36 * Validate the memory info for a font
37--
381.8.5
39
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
index 627a6d3d3c..16838f0eae 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
@@ -20,6 +20,11 @@ PROVIDES = "xft"
20 20
21PE = "1" 21PE = "1"
22 22
23SRC_URI += "file://freetype.patch"
24
25SRC_URI[md5sum] = "78d64dece560c9e8699199f3faa521c0"
26SRC_URI[sha256sum] = "7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd"
27
23XORG_PN = "libXft" 28XORG_PN = "libXft"
24 29
25BBCLASSEXTEND = "native" 30BBCLASSEXTEND = "native"
@@ -28,6 +33,3 @@ python () {
28 if d.getVar('DEBIAN_NAMES', True): 33 if d.getVar('DEBIAN_NAMES', True):
29 d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') 34 d.setVar('PKG_${PN}', '${MLPREFIX}libxft2')
30} 35}
31
32SRC_URI[md5sum] = "78d64dece560c9e8699199f3faa521c0"
33SRC_URI[sha256sum] = "7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd"