From 06a03d72113daf1031cf9f06e71243995de03f5f Mon Sep 17 00:00:00 2001 From: Jingdong Lu Date: Tue, 24 May 2011 13:57:57 +0800 Subject: 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. (From OE-Core rev: 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b) Signed-off-by: Jingdong Lu Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb') 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" -- cgit v1.2.3-54-g00ecf