diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-12-08 02:06:27 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-12-08 02:20:43 +0100 |
commit | 42a45352ddd64ac94a1ef1334cb28447cc3cbdd8 (patch) | |
tree | 9582c261492c0240050ec5a4a9b44128c6507a43 /recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | |
parent | 0ea8f1bca5e83e0146f36db113821624c7b8e6cb (diff) |
xserver-xorg: upgrade to 1.14.7
This is an upgrade from the former 1.14.4 recipe as found here:
http://cgit.openembedded.org/openembedded-core/tree/meta/
recipes-graphics/xorg-xserver?id=
b8feee3cf21f70ba4ec3b822d2f596d4fc02a292
Diffstat (limited to 'recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch')
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch new file mode 100644 index 0000000..168368e --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch @@ -0,0 +1,29 @@ +on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well +so we end up with incompatible conversion errors + +This patch choses the right values for mips64 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h +=================================================================== +--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 ++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 +@@ -101,6 +101,7 @@ + #if defined(NO_INLINE) || defined(DO_PROTOTYPES) + #if !defined(__arm__) + #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ ++ && !defined(__mips64) \ + && !(defined(__alpha__) && defined(linux)) \ + && !(defined(__ia64__) && defined(linux)) \ + +@@ -721,7 +722,7 @@ + } + + #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +-#ifdef __arm32__ ++#if defined (__arm32__) || defined (__mips64) + #define PORT_SIZE long + #else + #define PORT_SIZE short |