summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 11:53:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:40 +0000
commitbec2e54d546751e5a3b1ab60a141e56d9392a135 (patch)
tree8f73741da6c1f7d92fb6eb96ea0b6987fce45035 /meta/recipes-graphics
parente28927de86f5206161f8519f787312978e5fb54a (diff)
downloadpoky-bec2e54d546751e5a3b1ab60a141e56d9392a135.tar.gz
libx11-trim: Drop obsolete 1.3.4 version
(From OE-Core rev: 6cb72d5f008c6cbf4960d9dc260b82a056042b0f) 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.3.4/include_fix.patch21
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch45
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch12
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch33
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb20
5 files changed, 0 insertions, 131 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
deleted file mode 100644
index eeb4175b4f..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7--- libX11-1.3.4.orig/configure.ac
8+++ libX11-1.3.4/configure.ac
9@@ -353,9 +353,9 @@
10 #
11 # Find keysymdef.h
12 #
13-AC_MSG_CHECKING([keysymdef.h])
14-dir=`$PKG_CONFIG --variable=includedir xproto`
15-KEYSYMDEF="$dir/X11/keysymdef.h"
16+AC_ARG_WITH(keysymdef,
17+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
18+ KEYSYMDEF=$withval, KEYSYMDEF="")
19 if test -f "$KEYSYMDEF"; then
20 AC_MSG_RESULT([$KEYSYMDEF])
21 else
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
deleted file mode 100644
index e5eacf0515..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
deleted file mode 100644
index bf6c7d59c2..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- libX11-1.3.4.orig/configure.ac
4+++ libX11-1.3.4/configure.ac
5@@ -32,7 +32,6 @@
6
7 # Checks for programs.
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_CC
11 PKG_PROG_PKG_CONFIG
12
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
deleted file mode 100644
index 561b57762a..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/util/Makefile.am | 21 -----------------
5 1 file changed, 21 deletions(-)
6
7--- libX11-1.3.4.orig/src/util/Makefile.am
8+++ libX11-1.3.4/src/util/Makefile.am
9@@ -1,24 +1,3 @@
10
11-noinst_PROGRAMS=makekeys
12-
13-makekeys_CFLAGS = \
14- $(X11_CFLAGS) \
15- $(CWARNFLAGS)
16-
17-CC = @CC_FOR_BUILD@
18-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
19-CFLAGS = @CFLAGS_FOR_BUILD@
20-LDFLAGS = @LDFLAGS_FOR_BUILD@
21-
22 EXTRA_DIST = mkks.sh
23
24-if LINT
25-# Check source code with tools like lint & sparse
26-
27-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
28- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
29-
30-lint:
31- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
32-
33-endif LINT
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
deleted file mode 100644
index 3a8f2c46c8..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require libx11.inc
2
3DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
4
5LICENSE = "MIT & MIT-style & BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
7
8PR = "r2"
9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11
12SRC_URI += "file://x11_disable_makekeys.patch \
13 file://include_fix.patch \
14 file://nodolt.patch \
15 file://makekeys_crosscompile.patch"
16
17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
19
20EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"