rpms/xorg-x11-server/F-7 xserver-1.3.0-arm-iopl.patch, NONE, 1.1 xserver-1.3.0-randrama-no-zero-screens.patch, NONE, 1.1 xorg-x11-server.spec, 1.228, 1.229
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Mon Jun 4 20:29:33 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5891/F-7
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.3.0-arm-iopl.patch
xserver-1.3.0-randrama-no-zero-screens.patch
Log Message:
sync with rawhide
xserver-1.3.0-arm-iopl.patch:
--- NEW FILE xserver-1.3.0-arm-iopl.patch ---
--- 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
}
xserver-1.3.0-randrama-no-zero-screens.patch:
--- NEW FILE xserver-1.3.0-randrama-no-zero-screens.patch ---
--- 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)
{
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-7/xorg-x11-server.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- xorg-x11-server.spec 11 May 2007 19:52:05 -0000 1.228
+++ xorg-x11-server.spec 4 Jun 2007 20:28:37 -0000 1.229
@@ -1,4 +1,4 @@
-# FC7 cleanups: (TODO)
+# F8 TODO list:
#
# Fix rhpxl to no longer need vesamodes/extramodes
# RHEL5 bugfix sync
@@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
-Release: 5%{?dist}
+Release: 7%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -60,7 +60,9 @@
Patch2004: xserver-1.2.0-honor-displaysize.patch
Patch2005: xserver-1.2.99.901-xephyr-crash-at-exit.patch
Patch2006: xserver-1.3.0-less-randr-fakerama.patch
-Patch2007: xserver-1.3.0-randr12-config-hack.patch
+Patch2007: xserver-1.3.0-randr12-config-hack.patch
+Patch2008: xserver-1.3.0-randrama-no-zero-screens.patch
+Patch2009: xserver-1.3.0-arm-iopl.patch
# assorted PCI layer shenanigans. oh the pain.
Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -247,6 +249,7 @@
Obsoletes: XFree86-sdk xorg-x11-sdk
Requires: xorg-x11-util-macros
Requires: xorg-x11-proto-devel
+Requires: pkgconfig
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
Provides: libxf86config-devel = %{version}-%{release}
@@ -305,6 +308,8 @@
%patch2005 -p1 -b .xephyr-crash
%patch2006 -p1 -b .fakerama
%patch2007 -p1 -b .randrconfig
+%patch2008 -p1 -b .randrama-zero-screens
+%patch2009 -p1 -b .arm
%patch2500 -p1 -b .unbreak-domains
%patch2501 -p1 -b .pci-bus-count
@@ -570,6 +575,16 @@
%changelog
+* Mon Jun 04 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-7
+- 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.
+
+* Sat May 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-6
+- Make sdk subpackage Require: pkgconfig. Spotted in review for
+ xorg-x11-drv-apm. (#226577)
+
* Fri May 11 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-5
- xserver-1.3.0-fbdevhw-magic-numbers.patch: If the fbdev driver claims to
have a zero pixel clock, believe it. Fixes Xen paravirt. (#238451)
More information about the fedora-extras-commits
mailing list