diff options
author | Ross Burton <ross.burton@intel.com> | 2012-09-24 12:10:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:34 +0100 |
commit | 9d765590cfc03f23c884b924fee485c5cef4d2b2 (patch) | |
tree | 793f089c93c4321c1a3baf01e84a4841db2b17b6 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch | |
parent | fda7103eb69ad7ded09273e546b324e299ea29f1 (diff) | |
download | poky-9d765590cfc03f23c884b924fee485c5cef4d2b2.tar.gz |
xserver-xorg: upgrade to 1.11.4
gcc-47-warning.patch was integrated, so drop.
Add pkgconfig-deps.patch, a backport of a commit to fix bad exposed library
dependencies (which resulted in the keyboard driver depending on pixman).
(From OE-Core rev: 723e81af2a5b07024ab744c14cdccc12f554ef12)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch deleted file mode 100644 index e6bc95b449..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well | ||
2 | so we end up with incompatible conversion errors | ||
3 | |||
4 | This patch choses the right values for mips64 | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Index: xorg-server-1.11.2/hw/xfree86/common/compiler.h | ||
10 | =================================================================== | ||
11 | --- xorg-server-1.11.2.orig/hw/xfree86/common/compiler.h 2012-05-10 12:19:59.485599046 -0700 | ||
12 | +++ xorg-server-1.11.2/hw/xfree86/common/compiler.h 2012-05-10 12:20:53.109602488 -0700 | ||
13 | @@ -104,6 +104,7 @@ | ||
14 | |||
15 | # if !defined(__arm__) | ||
16 | # if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ | ||
17 | + && !defined(__mips64) \ | ||
18 | && !(defined(__alpha__) && defined(linux)) \ | ||
19 | && !(defined(__ia64__) && defined(linux)) \ | ||
20 | |||
21 | @@ -708,7 +709,7 @@ | ||
22 | } | ||
23 | |||
24 | # elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) | ||
25 | -# ifdef __arm32__ | ||
26 | +# if defined (__arm32__) || defined (__mips64) | ||
27 | # define PORT_SIZE long | ||
28 | # else | ||
29 | # define PORT_SIZE short | ||