summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11_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:55:56 +0100
commit06a03d72113daf1031cf9f06e71243995de03f5f (patch)
tree40d741521a0137bb41689edc6b4a8e2a56fbcf67 /meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
parentc0867a12462adcf5506eac3de0cd3bcaa652e451 (diff)
downloadpoky-06a03d72113daf1031cf9f06e71243995de03f5f.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. (From OE-Core rev: 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b) Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index 08ba07b06c..3e046a16af 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -5,11 +5,12 @@ LICENSE = "MIT & MIT-style & BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" 5LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
6 6
7PE = "1" 7PE = "1"
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI += "file://x11_disable_makekeys.patch \ 10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://nodolt.patch \ 11 file://nodolt.patch \
12 file://include_fix.patch" 12 file://include_fix.patch \
13 file://makekeys_crosscompile.patch"
13 14
14SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" 15SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
15SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" 16SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"