From 902ef062ccf1ed61766d0ac02ecb6c293c83245934d8a64808a0a49ff3d8cfd2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 15 Oct 2012 14:25:23 +0000 Subject: [PATCH] - u_vgaHW-no-legacy.patch * likely fixes build on ppc OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=416 --- u_vgaHW-no-legacy.patch | 23 +++++++++++++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 u_vgaHW-no-legacy.patch diff --git a/u_vgaHW-no-legacy.patch b/u_vgaHW-no-legacy.patch new file mode 100644 index 0000000..7ac21f6 --- /dev/null +++ b/u_vgaHW-no-legacy.patch @@ -0,0 +1,23 @@ +Author: Andreas Schwab +Subject: disable DACDelay on non-vga-hardware users +Patch-Mainline: To be upstreamed +Signed-Off-By: Marcus Meissner + +--- hw/xfree86/vgahw/vgaHW.h ++++ hw/xfree86/vgahw/vgaHW.h +@@ -168,11 +168,15 @@ typedef struct _vgaHWRec { + #define BITS_PER_GUN 6 + #define COLORMAP_SIZE 256 + ++#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) || defined(__nds32__) ++#define DACDelay(hw) /* No legacy VGA support */ ++#else + #define DACDelay(hw) \ + do { \ + (hw)->readST01((hw)); \ + (hw)->readST01((hw)); \ + } while (0) ++#endif + + /* Function Prototypes */ + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index faa0bfc..e4a5053 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 15 14:22:01 UTC 2012 - sndirsch@suse.com + +- u_vgaHW-no-legacy.patch + * likely fixes build on ppc + ------------------------------------------------------------------- Mon Sep 24 19:52:16 UTC 2012 - opensuse@cboltz.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8cd3a61..6cfa0f2 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -173,8 +173,8 @@ Patch213: N_xorg-server-xdmcp.patch Patch220: N_Use-external-tool-for-creating-backtraces-on-crashes.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch222: N_sync-fix.patch - Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch +Patch226: u_vgaHW-no-legacy.patch %description This package contains the X.Org Server. @@ -292,6 +292,7 @@ cp %{SOURCE96} . ### patch222 might not be applicable anymore #%patch222 -p1 %patch225 -p1 +%patch226 -p0 %build autoreconf -fi