diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2014-12-04 14:58:26 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 11:34:55 +0000 |
commit | acfb2982e851edb4505094f31bbba4bfbc88ca1e (patch) | |
tree | fa08ab82b6b180e1d29480b6bf530b59ef223653 /meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | |
parent | 993989f033a31f3ac72891d9627c0d2c46e893be (diff) | |
download | poky-acfb2982e851edb4505094f31bbba4bfbc88ca1e.tar.gz |
xorg-xserver: Upgrade to 1.16.2.
Add PACKAGECONFIG systemd, xserver-xorg now depends in dbus because
adds support for systemd-logind, dbus is used by xserver-xorg to
communicate with systemd.
Add conditional enablement of systemd-logind if DISTRO_FEATURES contains
systemd.
Remove crosscompile, mips64-compile and present-module because are already
in upstream.
(From OE-Core rev: 4c33baa4a95aee26c6bf6fd0c7ec827ff63a9e62)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch deleted file mode 100644 index 168368e6c3..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/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.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 | ||