diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-11-21 15:42:24 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-11-29 00:20:07 -0800 |
| commit | 6903f53e8e1f48849c9ed1aff837bba6feb1ccbe (patch) | |
| tree | ea7e4d7bd2d8db16c0ad87a658b5731acaa0039a /meta/recipes-graphics/xorg-lib | |
| parent | 1f55b31bdc8cf1da04ef29f4e44c1be6c0286ee2 (diff) | |
| download | openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.tar.gz openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.tar.bz2 openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.zip | |
libx11-trim: update to 1.4.4
Some description :
1 Remove --with-xcb because xcb is necessary item in the new version.
2 keysymdef_include.patch uses in keeping native directory of X11 as the default configuration. \
or else host directory "/usr/include/X11" is selected when running ./configure.
3 makekeys_crosscompile.patch avoid host contamination.
4 x11_disable_makekeys.patch uses in compiling makekey.c needed by makekeys-makekeys.o
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
4 files changed, 117 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch new file mode 100644 index 0000000000..d1bdab9778 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch new file mode 100644 index 0000000000..e5eacf0515 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.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.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb new file mode 100644 index 0000000000..7aed308838 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb @@ -0,0 +1,20 @@ +require libx11.inc + +DESCRIPTION += " Support for XCMS is disabled in this version." + +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +PR = "r0" + +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" + +SRC_URI += "file://x11_disable_makekeys.patch \ + file://keysymdef_include.patch \ + file://makekeys_crosscompile.patch" + + +SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" +SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms " |