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

* Thu Apr 09 2009 Adam Jackson <ajax@redhat.com> 1.6.0-19

Browse Source 
- xserver-1.6.0-no-i810.patch: Don't try to load i810.
This commit is contained in:
Adam Jackson 2009-04-09 14:45:38 +00:00
parent b390ba2dfd
commit 54ae3634b7
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.0
Release: 18%{?dist}
Release: 19%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -111,6 +111,7 @@ Patch6026: xserver-1.6.0-xinerama-crashes.patch
Patch6027: xserver-1.6.0-displayfd.patch
Patch6028: xserver-1.6.0-restore-zap.patch
Patch6029: xserver-1.6.0-no-i810.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@ -528,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Apr 09 2009 Adam Jackson <ajax@redhat.com> 1.6.0-19
- xserver-1.6.0-no-i810.patch: Don't try to load i810.
* Thu Apr 09 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-18
- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.

24
xserver-1.6.0-no-i810.patch Normal file
View File

@ -0,0 +1,24 @@
From be743d919d85a74133d714d4e5137416de02bfb7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 9 Apr 2009 10:38:51 -0400
Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it.
---
hw/xfree86/common/xf86AutoConfig.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 853d661..2e69a31 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -175,7 +175,6 @@ videoPtrToDriverList(struct pci_device *dev,
break; /* you got powervr in my intel! */
} else {
driverList[0] = "intel";
- driverList[1] = "i810";
}
break;
case 0x102b: driverList[0] = "mga"; break;
--
1.6.2