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-trim-1.3.4/makekeys_crosscompile.patch | |
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-trim-1.3.4/makekeys_crosscompile.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch | 45 |
1 files changed, 45 insertions, 0 deletions
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 new file mode 100644 index 0000000000..e5eacf0515 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch | |||
@@ -0,0 +1,45 @@ | |||
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; | ||