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

* Fri Jul 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-11.20090710

Browse Source 
- Today's git snapshot.
- xserver-1.6.0-no-i810.patch: Drop.
This commit is contained in:
Peter Hutterer 2009-07-10 04:41:40 +00:00
parent 1523d38d90
commit f3885d03b0
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commitid
View File

@ -1 +1 @@
89cf81cd85919e3dbb5adff5e6c6056c7990b60f 3711d68f657c77b947cc4670cc4eac4f62de3af8

10
xorg-x11-server.spec
View File

@ -14,12 +14,12 @@
# Fix rhpxl to no longer need vesamodes/extramodes # Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server %define pkgname xorg-server
%define gitdate 20090707 %define gitdate 20090710
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.99 Version: 1.6.99
Release: 10.%{gitdate}%{?dist} Release: 11.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -71,8 +71,6 @@ Patch6022: xserver-1.6.0-primary.patch
# ajax needs to upstream this # ajax needs to upstream this
Patch6027: xserver-1.6.0-displayfd.patch Patch6027: xserver-1.6.0-displayfd.patch
Patch6029: xserver-1.6.0-no-i810.patch
Patch6042: xserver-1.6.1-proc-cmdline.patch Patch6042: xserver-1.6.1-proc-cmdline.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
@ -536,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Jul 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-11.20090710
- Today's git snapshot.
- xserver-1.6.0-no-i810.patch: Drop.
* Tue Jul 07 2009 Adam Jackson <ajax@redhat.com> 1.6.99-10.20090707 * Tue Jul 07 2009 Adam Jackson <ajax@redhat.com> 1.6.99-10.20090707
- Today's git snapshot. - Today's git snapshot.
- xserver-1.4.99-pic-libxf86config.patch: Drop. - xserver-1.4.99-pic-libxf86config.patch: Drop.

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

@ -1,24 +0,0 @@
From 4cfe8e8e8342fe61113b0395d099d8ddb4ffb53e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 18 Jun 2009 13:49:28 +1000
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 abcedde..4ee5af6 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -176,7 +176,6 @@ videoPtrToDriverList(struct pci_device *dev,
break; /* "hooray" for poulsbo */
} else {
driverList[0] = "intel";
- driverList[1] = "i810";
}
break;
case 0x102b: driverList[0] = "mga"; break;
--
1.6.3.rc1.2.g0164.dirty