aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
diff options
context:
space:
mode:
authorJingdong Lu <jingdong.lu@windriver.com>2011-05-24 13:57:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-02 14:47:26 +0100
commit0eea9ab2e9d6e9457f24aa63b3126666611c1c7b (patch)
tree158b44df5ae0e89bbd992424b9c3de73fca1e3e5 /meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
parent39a3842c34cf344749d7269a91c47e3a1a86d2b8 (diff)
downloadopenembedded-core-0eea9ab2e9d6e9457f24aa63b3126666611c1c7b.tar.gz
libx11: fix libX11 keysyms to pass xts5 of lsb
Fixes bug: [YOCTO #1095] Because of cross-compiling libx11 keysyms will cause Xts5 test of LSB fail. libx11 use a tool named "makekey" which compiled as a native tool to generate ks_tables.h. Because the size of "unsigned long" is different between 32-bit and 64-bit, we should judge whether our target is 32-bit or 64-bit and tell "makekey". I add a patch to "makekeys_crosscompile.patch" to "src/utils/makekeys.c" in order to deal with the different targets. If our target is 32-bit, we force the variable its type is "unsigned long" to "uint32_t". So we can generate a correct keysyms. Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index b0134989ae..1469bc1dfa 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -5,12 +5,13 @@ DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
-PR = "r0"
+PR = "r1"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
file://../libx11-${PV}/include_fix.patch \
- file://../libx11-${PV}/nodolt.patch"
+ file://../libx11-${PV}/nodolt.patch \
+ file://../libx11-${PV}/makekeys_crosscompile.patch"
EXTRA_OECONF += "--disable-xcms --with-xcb"