sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

xserver-xorg: Fix build on powerpc 

(From OE-Core rev: 8a11f42d3ed526fae0c0bb050d7d0519904591b4)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2012-05-11 10:21:47 -07:00 committed by Richard Purdie
parent 350a459dc3
commit e63b1791cd
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
View File

@ -1,10 +1,11 @@
SRC_URI += "file://crosscompile.patch"
# Misc build failure for master HEAD
SRC_URI += "file://fix_open_max_preprocessor_error.patch"
SRC_URI += "file://crosscompile.patch \
file://fix_open_max_preprocessor_error.patch \
file://gcc-47-warning.patch \
"
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
PR = "r1"
PR = "r2"

33
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch Normal file
View File

@ -0,0 +1,33 @@
This patch fixes errors on powerpc like below
| lnx_video.c: In function 'unmapVidMem':
| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
Its in 1.12 branch
http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
Upstream-Status: Backport
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
===================================================================
--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700
+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
@@ -469,11 +469,11 @@
static void
unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
{
- memType alignOff = (memType)Base
- - ((memType)Base & ~(getpagesize() - 1));
+ uintptr_t alignOff = (uintptr_t)Base
+ - ((uintptr_t)Base & ~(getpagesize() - 1));
- DebugF("alignment offset: %lx\n",alignOff);
- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
+ DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
+ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
}