diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-11-15 13:07:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:53 +0000 |
commit | 69f1b459155fa7d9f43635e391ca8ac4c615b613 (patch) | |
tree | 91fba7458acec2c6094f9443e2b3f268db11f408 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch | |
parent | cb758f9d32aef5e990adc8f0178674e5fdb26565 (diff) | |
download | poky-69f1b459155fa7d9f43635e391ca8ac4c615b613.tar.gz |
xserver-xorg: upgrade to 1.13.0
The patch contains several aditional changes:
* removed one backported patch (included in the new release);
* changed mips64-compiler.patch to apply properly;
* licence checksum for COPYING file changed: some copyright years have
been changed;
* bump PR in xorg-driver-common.inc so that all input/video drivers
get rebuilt. That's becaue the ABI changed;
The following external modules are now built-in:
* DBE
* DRI2
* DRI
* RECORD
The extmod module was completely removed.
(From OE-Core rev: 506da0d139dd470475a1d6b2dd3ae62406c36816)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch new file mode 100644 index 0000000000..168368e6c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch | |||
@@ -0,0 +1,29 @@ | |||
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.13.0/hw/xfree86/common/compiler.h | ||
10 | =================================================================== | ||
11 | --- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 | ||
12 | +++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 | ||
13 | @@ -101,6 +101,7 @@ | ||
14 | #if defined(NO_INLINE) || defined(DO_PROTOTYPES) | ||
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 | @@ -721,7 +722,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 | ||