summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-21 15:42:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:06 +0000
commita791139329c003da2d0fbfc9f69daf0011790ba0 (patch)
tree5c4af791ee2d32091b6a96e0e2ba49adb330f093 /meta/recipes-graphics
parent98e370983657ee59a7ebbf24ecaf9a78bbd87010 (diff)
downloadpoky-a791139329c003da2d0fbfc9f69daf0011790ba0.tar.gz
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 (From OE-Core rev: 6903f53e8e1f48849c9ed1aff837bba6feb1ccbe) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch23
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch45
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch29
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb20
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 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 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 @@
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.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 @@
1Index: libX11-1.3.4/src/util/Makefile.am
2===================================================================
3--- libX11-1.3.4.orig/src/util/Makefile.am
4+++ libX11-1.3.4/src/util/Makefile.am
5@@ -1,24 +1 @@
6-
7-noinst_PROGRAMS=makekeys
8-
9-makekeys_CFLAGS = \
10- $(X11_CFLAGS) \
11- $(CWARNFLAGS)
12-
13-CC = @CC_FOR_BUILD@
14-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
15-CFLAGS = @CFLAGS_FOR_BUILD@
16-LDFLAGS = @LDFLAGS_FOR_BUILD@
17-
18 EXTRA_DIST = mkks.sh
19-
20-if LINT
21-# Check source code with tools like lint & sparse
22-
23-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
24- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
25-
26-lint:
27- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
28-
29-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 @@
1require libx11.inc
2
3DESCRIPTION += " Support for XCMS is disabled in this version."
4
5LICENSE = "MIT & MIT-style & BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7
8PR = "r0"
9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11
12SRC_URI += "file://x11_disable_makekeys.patch \
13 file://keysymdef_include.patch \
14 file://makekeys_crosscompile.patch"
15
16
17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
19
20EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms "