1
0

- 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
This commit is contained in:
Stefan Dirsch 2012-10-15 14:25:23 +00:00 committed by Git OBS Bridge
parent 68b3d6bdfd
commit 902ef062cc
3 changed files with 31 additions and 1 deletions

23
u_vgaHW-no-legacy.patch Normal file
View File

@ -0,0 +1,23 @@
Author: Andreas Schwab <schwab@suse.de>
Subject: disable DACDelay on non-vga-hardware users
Patch-Mainline: To be upstreamed
Signed-Off-By: Marcus Meissner <meissner@suse.de>
--- 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 */

View File

@ -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

View File

@ -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