From 90b219184f7539c4fa80e17393c00a9e79e98606 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 30 Mar 2007 19:32:06 +0000 Subject: [PATCH] auto-import xorg-x11-server-1.2.99.903-1.fc7 on branch devel from xorg-x11-server-1.2.99.903-1.fc7.src.rpm --- .cvsignore | 2 +- sources | 2 +- xorg-x11-server-1.2.99-unbreak-domain.patch | 17 ----------------- xorg-x11-server.spec | 11 ++++------- 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 xorg-x11-server-1.2.99-unbreak-domain.patch diff --git a/.cvsignore b/.cvsignore index 979594a..e431aba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.2.99.902.tar.bz2 +xorg-server-1.2.99.903.tar.bz2 diff --git a/sources b/sources index 6a8a63c..890f544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3013c42e2a450024983c78f5b0b4474 xorg-server-1.2.99.902.tar.bz2 +b7c61148bf5827f6a220696381bfba15 xorg-server-1.2.99.903.tar.bz2 diff --git a/xorg-x11-server-1.2.99-unbreak-domain.patch b/xorg-x11-server-1.2.99-unbreak-domain.patch deleted file mode 100644 index b48f299..0000000 --- a/xorg-x11-server-1.2.99-unbreak-domain.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c~ 2006-11-16 18:01:25.000000000 +0000 -+++ xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c 2007-03-07 15:44:10.000000000 +0000 -@@ -158,7 +158,13 @@ linuxPciOpenFile(PCITAG tag, Bool write) - if (stat("/sys/bus/pci",&ignored) < 0) - is26 = 0; - else -- is26 = 1; -+ /* If we don't find the incompatible IA64 "domain support" in -+ /proc/bus/pci then we don't know domain numbers. This means -+ we ought to use /proc/bus/pci for accessing devices, instead -+ of /sys/bus/pci. So in that case we just pretend it's a 2.4 -+ kernel, and hope the kernel has set up disjoint bus numbers -+ for us, like it always used to. */ -+ is26 = domain_support; - } - - if (!domain_support && domain > 0) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1fd5319..ec08e6e 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,8 +8,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.2.99.902 -Release: 2%{?dist} +Version: 1.2.99.903 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -28,7 +28,6 @@ Patch11: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch Patch12: xorg-x11-server-1.1.1-graphics-expose.patch Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch -Patch19: xorg-x11-server-1.2.99-unbreak-domain.patch # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch @@ -253,7 +252,6 @@ Xserver source code needed to build VNC server (Xvnc) %patch12 -p1 -b .graphics-expose %patch15 -p1 -b .automake-1.10 %patch18 -p1 -b .glcore-visual -%patch19 -p1 -b .unbreak-domains %patch100 -p0 -b .no-move-damage %patch101 -p0 -b .dont-backfill-bg-none @@ -478,7 +476,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so -%{_libdir}/xorg/modules/libramdac.so %{_libdir}/xorg/modules/libshadow.so %{_libdir}/xorg/modules/libshadowfb.so %{_libdir}/xorg/modules/libvbe.so @@ -563,8 +560,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Mar 30 2007 David Woodhouse 1.2.99.902-2 -- Fix regression with PCI domains, but disjoint bus numbers (#207659) +* Fri Mar 30 2007 Adam Jackson 1.2.99.903-1 +- xserver 1.3 RC3. * Mon Mar 19 2007 Adam Jackson 1.2.99.902-1 - xserver 1.3 RC2.