diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-03 09:52:37 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:37 +0100 |
commit | 2ee903a73804f16e844c98285962123413bc457b (patch) | |
tree | d2a12ae74c2551ba74a15d7cf128543bd5678ea3 /meta/recipes-graphics/xorg-lib/libx11-1.3.4 | |
parent | dc64df6c176c7e56095c4d09a2d00b8a4d976a7c (diff) | |
download | poky-2ee903a73804f16e844c98285962123413bc457b.tar.gz |
libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
(From OE-Core rev: ccebeb736c785cc6ade075798a1d5c27f106d780)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-1.3.4')
4 files changed, 0 insertions, 111 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch deleted file mode 100644 index eeb4175b4f..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Upstream-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-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch deleted file mode 100644 index e5eacf0515..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | Because the size of "unsigned long" is different between 32-bit | ||
2 | and 64-bit, judge whether target is 32-bit or 64-bit and tell | ||
3 | "makekey". | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-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-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch deleted file mode 100644 index bf6c7d59c2..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Upstream-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-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch deleted file mode 100644 index 561b57762a..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Upstream-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 | ||