diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-05-11 10:21:47 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-11 23:25:06 +0100 |
| commit | 8a11f42d3ed526fae0c0bb050d7d0519904591b4 (patch) | |
| tree | 0b9e8e4c9b7ee364aa80a2065a194ab1bb47a94e | |
| parent | 45510a0dd7a9321c29c5b21ac4053192f7ab9ad5 (diff) | |
| download | openembedded-core-8a11f42d3ed526fae0c0bb050d7d0519904591b4.tar.gz openembedded-core-8a11f42d3ed526fae0c0bb050d7d0519904591b4.tar.bz2 openembedded-core-8a11f42d3ed526fae0c0bb050d7d0519904591b4.tar.xz openembedded-core-8a11f42d3ed526fae0c0bb050d7d0519904591b4.zip | |
xserver-xorg: Fix build on powerpc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 9 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch | 33 |
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 f5fa62910..6a86af400 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 @@ -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" 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 000000000..ed4eaac39 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch @@ -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)); + } + + |