forked from pool/xorg-x11-server
Accepting request 21946 from X11:XOrg
Copy from X11:XOrg/xorg-x11-server based on submit request 21946 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/21946 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=145
This commit is contained in:
parent
0ecf070810
commit
b8b5a4fbcb
@ -1,7 +1,5 @@
|
||||
Index: hw/xfree86/common/xf86AutoConfig.c
|
||||
===================================================================
|
||||
--- hw/xfree86/common/xf86AutoConfig.c.orig
|
||||
+++ hw/xfree86/common/xf86AutoConfig.c
|
||||
--- hw/xfree86/common/xf86AutoConfig.c.orig 2009-10-07 04:54:44.000000000 +0200
|
||||
+++ hw/xfree86/common/xf86AutoConfig.c 2009-10-07 04:56:23.000000000 +0200
|
||||
@@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
case 0x1142: driverList[0] = "apm"; break;
|
||||
case 0xedd8: driverList[0] = "ark"; break;
|
||||
@ -15,7 +13,7 @@ Index: hw/xfree86/common/xf86AutoConfig.c
|
||||
case 0x102c: driverList[0] = "chips"; break;
|
||||
case 0x1013: driverList[0] = "cirrus"; break;
|
||||
case 0x8086:
|
||||
@@ -179,7 +183,12 @@ videoPtrToDriverList(struct pci_device *
|
||||
@@ -179,7 +183,15 @@ videoPtrToDriverList(struct pci_device *
|
||||
case 0x102b: driverList[0] = "mga"; break;
|
||||
case 0x10c8: driverList[0] = "neomagic"; break;
|
||||
case 0x105d: driverList[0] = "i128"; break;
|
||||
@ -24,12 +22,15 @@ Index: hw/xfree86/common/xf86AutoConfig.c
|
||||
+ case 0x10de:
|
||||
+ driverList[0] = "nvidia";
|
||||
+ driverList[1] = "nouveau";
|
||||
+ driverList[2] = "nv";
|
||||
+ /* GeForce 6150SE support broken (bnc #465190/544674) */
|
||||
+ if (dev->device_id != 0x03D0) {
|
||||
+ driverList[2] = "nv";
|
||||
+ }
|
||||
+ break;
|
||||
case 0x1163: driverList[0] = "rendition"; break;
|
||||
case 0x5333:
|
||||
switch (dev->device_id)
|
||||
@@ -205,7 +214,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
@@ -205,7 +217,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
case 0x3d3d: driverList[0] = "glint"; break;
|
||||
case 0x1023: driverList[0] = "trident"; break;
|
||||
case 0x100c: driverList[0] = "tseng"; break;
|
||||
@ -42,7 +43,7 @@ Index: hw/xfree86/common/xf86AutoConfig.c
|
||||
case 0x15ad: driverList[0] = "vmware"; break;
|
||||
case 0x18ca:
|
||||
if (dev->device_id == 0x47)
|
||||
@@ -213,6 +226,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
@@ -213,6 +229,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
else
|
||||
driverList[0] = "xgi";
|
||||
break;
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 7 04:58:29 CEST 2009 - sndirsch@suse.de
|
||||
|
||||
- driver-autoconfig.diff
|
||||
* GeForce 6150SE support broken on nv (bnc #465190/544674)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 1 02:50:16 CEST 2009 - sndirsch@suse.de
|
||||
|
||||
|
@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
|
||||
Url: http://xorg.freedesktop.org/
|
||||
%define EXPERIMENTAL 0
|
||||
Version: 7.4
|
||||
Release: 57
|
||||
Release: 58
|
||||
License: GPL v2 or later ; MIT License (or similar)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: System/X11/Servers/XF86_4
|
||||
|
Loading…
Reference in New Issue
Block a user