1
0
OBS User unknown 2007-04-28 12:45:35 +00:00 committed by Git OBS Bridge
parent b0b73eb0ae
commit c553bf4ff2
3 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,19 @@
>From freedesktop bug #7248, to "fix" domain support so X works on Pegasos and others.
--- 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)

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Apr 28 09:54:28 CEST 2007 - sndirsch@suse.de
- xorg-x11-server-1.2.99-unbreak-domain.patch:
* This patch fixes some multi-domain systems such as Pegasos with
xorg-server 1.3. Since pci-rework should get merged soon and
this patch is a bit of a hack, it never got pushed upstream.
(X.Org Bug #7248)
-------------------------------------------------------------------
Fri Apr 27 17:00:21 CEST 2007 - sndirsch@suse.de

View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 76
Release: 77
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -99,6 +99,7 @@ Patch59: bug-211314-patch-11.diff
Patch60: bug-211314_mesa-refcount-memleak-fixes.diff
Patch61: bug-259290_trapfault.diff
Patch62: Mesa-6.5.2-fix_radeon_cliprect.diff
Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
@ -209,6 +210,7 @@ pushd ../Mesa
%patch62 -p1
popd
%patch61 -p1
%patch63 -p1
%build
autoreconf -fi
@ -539,6 +541,12 @@ exit 0
%endif
%changelog
* Sat Apr 28 2007 - sndirsch@suse.de
- xorg-x11-server-1.2.99-unbreak-domain.patch:
* This patch fixes some multi-domain systems such as Pegasos with
xorg-server 1.3. Since pci-rework should get merged soon and
this patch is a bit of a hack, it never got pushed upstream.
(X.Org Bug #7248)
* Fri Apr 27 2007 - sndirsch@suse.de
- back to Mesa 6.5.2 (Bug #269155/269042)
* Wed Apr 25 2007 - sndirsch@suse.de