summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-22 19:38:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:16 +0100
commit252b7ee21e264c36e841bcfe9f6ade134fcbef7a (patch)
tree215eed0ae16b8ecdfa38b4711748ebc72dc2e5c1 /meta/recipes-graphics/xorg-lib
parent4bdd18ed2ea92c6dea38f96440c8fc7b00370858 (diff)
downloadpoky-252b7ee21e264c36e841bcfe9f6ade134fcbef7a.tar.gz
libxft: upgrade to 2.3.2
Remove patch that has been merged upstream. (From OE-Core rev: c2a4fa3669ca8607845347c0c196fa96478156cb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libxft/freetype.patch39
-rw-r--r--meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb (renamed from meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb)6
2 files changed, 2 insertions, 43 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxft/freetype.patch b/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
deleted file mode 100644
index 9f1aa21bac..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
+++ /dev/null
@@ -1,39 +0,0 @@
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.2.bb
index 16838f0eae..a967cdc585 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
@@ -20,10 +20,8 @@ PROVIDES = "xft"
20 20
21PE = "1" 21PE = "1"
22 22
23SRC_URI += "file://freetype.patch" 23SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe"
24 24SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c"
25SRC_URI[md5sum] = "78d64dece560c9e8699199f3faa521c0"
26SRC_URI[sha256sum] = "7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd"
27 25
28XORG_PN = "libXft" 26XORG_PN = "libXft"
29 27