rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jun 04 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-7

Browse Source 
- xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake
  Xinerama info, don't report Xinerama as being active if there are no
  RANDR 1.2 CRTCs active for that screen.  (#234567)
- xserver-1.3.0-arm-iopl.patch: Add __arm__ conditionals to many #ifdefs.
This commit is contained in:
Adam Jackson 2007-06-04 18:35:31 +00:00
parent ab195404ac
commit 8517f83331
2 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
xserver-1.3.0-arm-iopl.patch Normal file
View File

@ -0,0 +1,53 @@
--- xorg-server-1.3.0.0/hw/xfree86/common/xf86Bus.c.arm 2007-02-17 20:37:56.000000000 -0500
+++ xorg-server-1.3.0.0/hw/xfree86/common/xf86Bus.c 2007-06-04 11:33:14.000000000 -0400
@@ -3006,7 +3006,7 @@
}
-#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__)
+#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__)
#include "vgaHW.h"
#include "compiler.h"
#endif
@@ -3018,7 +3018,7 @@
CheckGenericGA()
{
/* This needs to be changed for multiple domains */
-#if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__)
+#if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__) && !defined(__arm__)
IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
CARD8 CurrentValue, TestValue;
--- xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_video.c.arm 2006-09-18 02:04:18.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_video.c 2007-06-04 11:35:21.000000000 -0400
@@ -62,7 +62,8 @@
#elif !defined(__powerpc__) && \
!defined(__mc68000__) && \
!defined(__sparc__) && \
- !defined(__mips__)
+ !defined(__mips__) && \
+ !defined(__arm__)
/*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
@@ -567,7 +568,7 @@
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
--- xorg-server-1.3.0.0/hw/xfree86/os-support/misc/SlowBcopy.c.arm 2006-09-18 02:04:18.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/os-support/misc/SlowBcopy.c 2007-06-04 11:31:28.000000000 -0400
@@ -35,7 +35,8 @@
#if !defined(__sparc__) && \
!defined(__powerpc__) && \
!defined(__mips__) && \
- !defined(__ia64__)
+ !defined(__ia64__) && \
+ !defined(__arm__)
outb(0x80, 0x00);
#endif
}

37
xserver-1.3.0-randrama-no-zero-screens.patch Normal file
View File

@ -0,0 +1,37 @@
--- xorg-server-1.3.0.0/randr/rrxinerama.c.jx 2007-05-17 17:07:31.000000000 -0400
+++ xorg-server-1.3.0.0/randr/rrxinerama.c 2007-05-31 21:41:13.000000000 -0400
@@ -147,12 +147,6 @@
}
static Bool
-RRXineramaScreenActive (ScreenPtr pScreen)
-{
- return rrGetScrPriv(pScreen) != NULL;
-}
-
-static Bool
RRXineramaCrtcActive (RRCrtcPtr crtc)
{
return crtc->mode != NULL && crtc->numOutputs > 0;
@@ -164,7 +158,7 @@
int i, n;
n = 0;
- if (RRXineramaScreenActive (pScreen))
+ if (rrGetScrPriv (pScreen))
{
rrScrPriv(pScreen);
for (i = 0; i < pScrPriv->numCrtcs; i++)
@@ -174,6 +168,12 @@
return n;
}
+static Bool
+RRXineramaScreenActive (ScreenPtr pScreen)
+{
+ return RRXineramaScreenCount (pScreen) > 0;
+}
+
int
ProcRRXineramaGetScreenCount(ClientPtr client)
{