summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch45
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb5
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc8
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb5
4 files changed, 58 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
new file mode 100644
index 0000000000..e5eacf0515
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
@@ -0,0 +1,45 @@
1Because the size of "unsigned long" is different between 32-bit
2and 64-bit, judge whether target is 32-bit or 64-bit and tell
3"makekey".
4
5Upstream-Status: Pending
6
7Signed-off-by: dbuitenh@windriver.com
8
9--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800
10+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
11@@ -33,6 +33,7 @@
12 #include <X11/keysymdef.h>
13 #include <stdio.h>
14 #include <stdlib.h>
15+#include <stdint.h>
16
17 typedef unsigned long Signature;
18
19@@ -124,7 +125,12 @@
20 name = info[i].name;
21 sig = 0;
22 while ((c = *name++))
23- sig = (sig << 1) + c;
24+#ifdef USE32
25+ sig = (uint32_t)(sig << 1) + c;
26+#else
27+ sig = (uint64_t)(sig << 1) + c;
28+#endif
29+
30 first = j = sig % z;
31 for (k = 0; tab[j]; k++) {
32 j += first + 1;
33@@ -163,7 +169,11 @@
34 name = info[i].name;
35 sig = 0;
36 while ((c = *name++))
37- sig = (sig << 1) + c;
38+#ifdef USE32
39+ sig = (uint32_t)(sig << 1) + c;
40+#else
41+ sig = (uint64_t)(sig << 1) + c;
42+#endif
43 first = j = sig % z;
44 while (offsets[j]) {
45 j += first + 1;
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."
5LICENSE = "MIT & MIT-style & BSD" 5LICENSE = "MIT & MIT-style & BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" 6LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
7 7
8PR = "r0" 8PR = "r1"
9 9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11 11
12SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \ 12SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
13 file://../libx11-${PV}/include_fix.patch \ 13 file://../libx11-${PV}/include_fix.patch \
14 file://../libx11-${PV}/nodolt.patch" 14 file://../libx11-${PV}/nodolt.patch \
15 file://../libx11-${PV}/makekeys_crosscompile.patch"
15 16
16EXTRA_OECONF += "--disable-xcms --with-xcb" 17EXTRA_OECONF += "--disable-xcms --with-xcb"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 030b0dbc5d..c156ce6dcb 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -6,6 +6,8 @@ basic functions of the window system."
6 6
7require xorg-lib-common.inc 7require xorg-lib-common.inc
8 8
9inherit siteinfo
10
9PROVIDES = "virtual/libx11" 11PROVIDES = "virtual/libx11"
10 12
11XORG_PN = "libX11" 13XORG_PN = "libX11"
@@ -22,7 +24,11 @@ do_compile() {
22 touch makekeys-makekeys.o 24 touch makekeys-makekeys.o
23 ( 25 (
24 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS 26 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
25 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys 27 if [ "${SITEINFO_BITS}" == "64" ]; then
28 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
29 else
30 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
31 fi
26 ) 32 )
27 if [ "$?" != "0" ]; then 33 if [ "$?" != "0" ]; then
28 exit 1 34 exit 1
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"