rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=114

Browse Source
This commit is contained in:
OBS User unknown 2009-02-26 02:43:28 +00:00 committed by Git OBS Bridge
parent b85f640cc1
commit bd564af56b
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bug474071-fix1.diff Normal file
View File

@ -0,0 +1,33 @@
--- linuxPci.c.orig 2009-02-19 16:50:50.169751885 +0100
+++ linuxPci.c 2009-02-19 16:55:59.991516595 +0100
@@ -291,7 +291,7 @@
struct pci_id_match bridge_match = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
(PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8),
- 0
+ (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8)
};
struct pci_device *bridge;
struct pci_device_iterator *iter;
@@ -526,7 +526,6 @@
xf86MapLegacyIO(struct pci_device *dev)
{
const int domain = dev->domain;
- struct pci_device *bridge = get_parent_bridge(dev);
int fd;
if (domain >= MAX_DOMAINS)
@@ -534,9 +533,11 @@
if (DomainMmappedIO[domain] == NULL) {
/* Permanently map all of I/O space */
- fd = linuxOpenLegacy(bridge, "legacy_io");
+ fd = linuxOpenLegacy(dev, "legacy_io");
if (fd < 0) {
- DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge,
+ struct pci_device *bridge = get_parent_bridge(dev);
+ if (bridge != NULL)
+ DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge,
0, linuxGetIOSize(bridge),
PCIIOC_MMAP_IS_IO);
}

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 24 12:08:59 CET 2009 - sndirsch@suse.de
- bug474071-fix1.diff
* fixes Xserver issue of bnc #474071
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 16 09:03:31 CET 2009 - sndirsch@suse.de Mon Feb 16 09:03:31 CET 2009 - sndirsch@suse.de

9
xorg-x11-server.spec
View File

@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 25 Release: 27
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -113,6 +113,7 @@ Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
Patch126: commit-a9e2030.diff Patch126: commit-a9e2030.diff
Patch127: dpms_screensaver.diff Patch127: dpms_screensaver.diff
Patch128: pci-legacy-mem-fallback.diff Patch128: pci-legacy-mem-fallback.diff
Patch129: bug474071-fix1.diff
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -235,6 +236,9 @@ popd
%patch126 -p1 %patch126 -p1
%patch127 -p1 %patch127 -p1
%patch128 %patch128
pushd hw/xfree86/os-support/bus
%patch129 -p0
popd
%build %build
pushd xorg-docs-* pushd xorg-docs-*
@ -566,6 +570,9 @@ exit 0
%endif %endif
%changelog %changelog
* Tue Feb 24 2009 sndirsch@suse.de
- bug474071-fix1.diff
* fixes Xserver issue of bnc #474071
* Mon Feb 16 2009 sndirsch@suse.de * Mon Feb 16 2009 sndirsch@suse.de
- /var/X11R6/bin no longer covered by FHS; switched to - /var/X11R6/bin no longer covered by FHS; switched to
/var/lib/X11 (bnc #470969) /var/lib/X11 (bnc #470969)