summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-05-11 10:21:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:16:42 +0100
commit81aac104facbb43819a6708b488f38735453f5f9 (patch)
treee730c9802a293e92b0d15af5f5a94e896c9214bd /meta/recipes-graphics
parentbc754beb3aa476e4ad97a22c2dac80e4e7de565a (diff)
downloadpoky-81aac104facbb43819a6708b488f38735453f5f9.tar.gz
xserver-xorg: Fix build on powerpc
(From OE-Core rev: 5e141b2a7331f7ee8d9eedf02c4fc2ae5ed8d5ec) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc9
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch33
2 files changed, 38 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index f5fa629105..6a86af4001 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -1,10 +1,11 @@
1SRC_URI += "file://crosscompile.patch"
2
3# Misc build failure for master HEAD 1# Misc build failure for master HEAD
4SRC_URI += "file://fix_open_max_preprocessor_error.patch" 2SRC_URI += "file://crosscompile.patch \
3 file://fix_open_max_preprocessor_error.patch \
4 file://gcc-47-warning.patch \
5 "
5 6
6SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 7SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
7SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" 8SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
8 9
9PR = "r1" 10PR = "r2"
10 11
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
new file mode 100644
index 0000000000..ed4eaac391
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
@@ -0,0 +1,33 @@
1This patch fixes errors on powerpc like below
2
3| lnx_video.c: In function 'unmapVidMem':
4| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
5
6Its in 1.12 branch
7
8http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
9
10Upstream-Status: Backport
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
15===================================================================
16--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700
17+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
18@@ -469,11 +469,11 @@
19 static void
20 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
21 {
22- memType alignOff = (memType)Base
23- - ((memType)Base & ~(getpagesize() - 1));
24+ uintptr_t alignOff = (uintptr_t)Base
25+ - ((uintptr_t)Base & ~(getpagesize() - 1));
26
27- DebugF("alignment offset: %lx\n",alignOff);
28- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
29+ DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
30+ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
31 }
32
33