diff options
| author |   Jingdong Lu <jingdong.lu@windriver.com> | 2011-05-24 13:57:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-02 14:47:26 +0100 |
| commit | 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b (patch) | |
| tree | 158b44df5ae0e89bbd992424b9c3de73fca1e3e5 /meta/recipes-graphics | |
| parent | 39a3842c34cf344749d7269a91c47e3a1a86d2b8 (diff) | |
| download | openembedded-core-contrib-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')
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 @@ +Because the size of "unsigned long" is different between 32-bit +and 64-bit, judge whether target is 32-bit or 64-bit and tell +"makekey". + +Upstream-Status: Pending + +Signed-off-by: dbuitenh@windriver.com + +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 +@@ -33,6 +33,7 @@ + #include <X11/keysymdef.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + + typedef unsigned long Signature; + +@@ -124,7 +125,12 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif ++ + first = j = sig % z; + for (k = 0; tab[j]; k++) { + j += first + 1; +@@ -163,7 +169,11 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif + first = j = sig % z; + while (offsets[j]) { + 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." 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" 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." require xorg-lib-common.inc +inherit siteinfo + PROVIDES = "virtual/libx11" XORG_PN = "libX11" @@ -22,7 +24,11 @@ do_compile() { touch makekeys-makekeys.o ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + if [ "${SITEINFO_BITS}" == "64" ]; then + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + else + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys + fi ) if [ "$?" != "0" ]; then 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" LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" PE = "1" -PR = "r0" +PR = "r1" SRC_URI += "file://x11_disable_makekeys.patch \ file://nodolt.patch \ - file://include_fix.patch" + file://include_fix.patch \ + file://makekeys_crosscompile.patch" SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" |