forked from pool/xorg-x11-server
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
eebf1430c6
commit
c772718a78
54
driver-autoconfig.diff
Normal file
54
driver-autoconfig.diff
Normal file
@ -0,0 +1,54 @@
|
||||
--- hw/xfree86/common/xf86AutoConfig.c.old 2009-06-05 20:48:39.000000000 +0000
|
||||
+++ hw/xfree86/common/xf86AutoConfig.c 2009-06-05 21:38:15.000000000 +0000
|
||||
@@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
case 0x1142: driverList[0] = "apm"; break;
|
||||
case 0xedd8: driverList[0] = "ark"; break;
|
||||
case 0x1a03: driverList[0] = "ast"; break;
|
||||
- case 0x1002: driverList[0] = "ati"; break;
|
||||
+ case 0x1002:
|
||||
+ driverList[0] = "fglrx";
|
||||
+ driverList[1] = "radeonhd";
|
||||
+ driverList[2] = "ati";
|
||||
+ break;
|
||||
case 0x102c: driverList[0] = "chips"; break;
|
||||
case 0x1013: driverList[0] = "cirrus"; break;
|
||||
case 0x8086:
|
||||
@@ -182,7 +186,12 @@ videoPtrToDriverList(struct pci_device *
|
||||
case 0x102b: driverList[0] = "mga"; break;
|
||||
case 0x10c8: driverList[0] = "neomagic"; break;
|
||||
case 0x105d: driverList[0] = "i128"; break;
|
||||
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
|
||||
+ case 0x12d2: driverList[0] = "nv"; break;
|
||||
+ case 0x10de:
|
||||
+ driverList[0] = "nvidia";
|
||||
+ driverList[1] = "nouveau";
|
||||
+ driverList[2] = "nv";
|
||||
+ break;
|
||||
case 0x1163: driverList[0] = "rendition"; break;
|
||||
case 0x5333:
|
||||
switch (dev->device_id)
|
||||
@@ -208,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;
|
||||
- case 0x1106: driverList[0] = "openchrome"; break;
|
||||
+ case 0x1106:
|
||||
+ driverList[0] = "chrome9";
|
||||
+ driverList[1] = "openchrome";
|
||||
+ driverList[2] = "unichrome";
|
||||
+ break;
|
||||
case 0x15ad: driverList[0] = "vmware"; break;
|
||||
case 0x18ca:
|
||||
if (dev->device_id == 0x47)
|
||||
@@ -216,6 +229,11 @@ videoPtrToDriverList(struct pci_device *
|
||||
else
|
||||
driverList[0] = "xgi";
|
||||
break;
|
||||
+ case 0x80ee:
|
||||
+ if (dev->device_id == 0xbeef) {
|
||||
+ driverList[0] = "vboxvideo";
|
||||
+ }
|
||||
+ break;
|
||||
default: break;
|
||||
}
|
||||
for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {
|
||||
@ -1,21 +0,0 @@
|
||||
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
|
||||
index 29b58e9..4c800e9 100644
|
||||
--- a/hw/xfree86/common/xf86AutoConfig.c
|
||||
+++ b/hw/xfree86/common/xf86AutoConfig.c
|
||||
@@ -164,7 +164,15 @@ videoPtrToDriverList(struct pci_device *dev,
|
||||
case 0x1142: driverList[0] = "apm"; break;
|
||||
case 0xedd8: driverList[0] = "ark"; break;
|
||||
case 0x1a03: driverList[0] = "ast"; break;
|
||||
- case 0x1002: driverList[0] = "ati"; break;
|
||||
+ case 0x1002:
|
||||
+ if (
|
||||
+#include "radeonhd.h"
|
||||
+ ) {
|
||||
+ driverList[0] = "radeonhd";
|
||||
+ } else {
|
||||
+ driverList[0] = "ati";
|
||||
+ }
|
||||
+ break;
|
||||
case 0x102c: driverList[0] = "chips"; break;
|
||||
case 0x1013: driverList[0] = "cirrus"; break;
|
||||
case 0x3d3d: driverList[0] = "glint"; break;
|
||||
205
radeonhd.h
205
radeonhd.h
@ -1,205 +0,0 @@
|
||||
(dev->device_id == 0x7100) ||
|
||||
(dev->device_id == 0x7101) ||
|
||||
(dev->device_id == 0x7102) ||
|
||||
(dev->device_id == 0x7103) ||
|
||||
(dev->device_id == 0x7104) ||
|
||||
(dev->device_id == 0x7105) ||
|
||||
(dev->device_id == 0x7106) ||
|
||||
(dev->device_id == 0x7108) ||
|
||||
(dev->device_id == 0x7109) ||
|
||||
(dev->device_id == 0x710a) ||
|
||||
(dev->device_id == 0x710b) ||
|
||||
(dev->device_id == 0x710c) ||
|
||||
(dev->device_id == 0x710e) ||
|
||||
(dev->device_id == 0x710f) ||
|
||||
(dev->device_id == 0x7140) ||
|
||||
(dev->device_id == 0x7141) ||
|
||||
(dev->device_id == 0x7142) ||
|
||||
(dev->device_id == 0x7143) ||
|
||||
(dev->device_id == 0x7144) ||
|
||||
(dev->device_id == 0x7145) ||
|
||||
(dev->device_id == 0x7146) ||
|
||||
(dev->device_id == 0x7147) ||
|
||||
(dev->device_id == 0x7149) ||
|
||||
(dev->device_id == 0x714a) ||
|
||||
(dev->device_id == 0x714b) ||
|
||||
(dev->device_id == 0x714c) ||
|
||||
(dev->device_id == 0x714d) ||
|
||||
(dev->device_id == 0x714e) ||
|
||||
(dev->device_id == 0x714f) ||
|
||||
(dev->device_id == 0x7151) ||
|
||||
(dev->device_id == 0x7152) ||
|
||||
(dev->device_id == 0x7153) ||
|
||||
(dev->device_id == 0x715e) ||
|
||||
(dev->device_id == 0x715f) ||
|
||||
(dev->device_id == 0x7180) ||
|
||||
(dev->device_id == 0x7181) ||
|
||||
(dev->device_id == 0x7183) ||
|
||||
(dev->device_id == 0x7186) ||
|
||||
(dev->device_id == 0x7187) ||
|
||||
(dev->device_id == 0x7188) ||
|
||||
(dev->device_id == 0x718a) ||
|
||||
(dev->device_id == 0x718b) ||
|
||||
(dev->device_id == 0x718c) ||
|
||||
(dev->device_id == 0x718d) ||
|
||||
(dev->device_id == 0x718f) ||
|
||||
(dev->device_id == 0x7193) ||
|
||||
(dev->device_id == 0x7196) ||
|
||||
(dev->device_id == 0x719b) ||
|
||||
(dev->device_id == 0x719f) ||
|
||||
(dev->device_id == 0x71c0) ||
|
||||
(dev->device_id == 0x71c1) ||
|
||||
(dev->device_id == 0x71c2) ||
|
||||
(dev->device_id == 0x71c3) ||
|
||||
(dev->device_id == 0x71c4) ||
|
||||
(dev->device_id == 0x71c5) ||
|
||||
(dev->device_id == 0x71c6) ||
|
||||
(dev->device_id == 0x71c7) ||
|
||||
(dev->device_id == 0x71cd) ||
|
||||
(dev->device_id == 0x71ce) ||
|
||||
(dev->device_id == 0x71d2) ||
|
||||
(dev->device_id == 0x71d4) ||
|
||||
(dev->device_id == 0x71d5) ||
|
||||
(dev->device_id == 0x71d6) ||
|
||||
(dev->device_id == 0x71da) ||
|
||||
(dev->device_id == 0x71de) ||
|
||||
(dev->device_id == 0x7200) ||
|
||||
(dev->device_id == 0x7210) ||
|
||||
(dev->device_id == 0x7211) ||
|
||||
(dev->device_id == 0x7240) ||
|
||||
(dev->device_id == 0x7243) ||
|
||||
(dev->device_id == 0x7244) ||
|
||||
(dev->device_id == 0x7245) ||
|
||||
(dev->device_id == 0x7246) ||
|
||||
(dev->device_id == 0x7247) ||
|
||||
(dev->device_id == 0x7248) ||
|
||||
(dev->device_id == 0x7249) ||
|
||||
(dev->device_id == 0x724a) ||
|
||||
(dev->device_id == 0x724b) ||
|
||||
(dev->device_id == 0x724c) ||
|
||||
(dev->device_id == 0x724d) ||
|
||||
(dev->device_id == 0x724e) ||
|
||||
(dev->device_id == 0x724f) ||
|
||||
(dev->device_id == 0x7280) ||
|
||||
(dev->device_id == 0x7281) ||
|
||||
(dev->device_id == 0x7283) ||
|
||||
(dev->device_id == 0x7284) ||
|
||||
(dev->device_id == 0x7287) ||
|
||||
(dev->device_id == 0x7288) ||
|
||||
(dev->device_id == 0x7289) ||
|
||||
(dev->device_id == 0x728b) ||
|
||||
(dev->device_id == 0x728c) ||
|
||||
(dev->device_id == 0x7290) ||
|
||||
(dev->device_id == 0x7291) ||
|
||||
(dev->device_id == 0x7293) ||
|
||||
(dev->device_id == 0x7297) ||
|
||||
(dev->device_id == 0x791e) ||
|
||||
(dev->device_id == 0x791f) ||
|
||||
(dev->device_id == 0x793f) ||
|
||||
(dev->device_id == 0x7941) ||
|
||||
(dev->device_id == 0x7942) ||
|
||||
(dev->device_id == 0x796c) ||
|
||||
(dev->device_id == 0x796d) ||
|
||||
(dev->device_id == 0x796e) ||
|
||||
(dev->device_id == 0x796f) ||
|
||||
(dev->device_id == 0x9400) ||
|
||||
(dev->device_id == 0x9401) ||
|
||||
(dev->device_id == 0x9402) ||
|
||||
(dev->device_id == 0x9403) ||
|
||||
(dev->device_id == 0x9405) ||
|
||||
(dev->device_id == 0x940a) ||
|
||||
(dev->device_id == 0x940b) ||
|
||||
(dev->device_id == 0x940f) ||
|
||||
(dev->device_id == 0x9440) ||
|
||||
(dev->device_id == 0x9441) ||
|
||||
(dev->device_id == 0x9442) ||
|
||||
(dev->device_id == 0x9443) ||
|
||||
(dev->device_id == 0x9444) ||
|
||||
(dev->device_id == 0x9446) ||
|
||||
(dev->device_id == 0x9447) ||
|
||||
(dev->device_id == 0x944a) ||
|
||||
(dev->device_id == 0x944b) ||
|
||||
(dev->device_id == 0x944e) ||
|
||||
(dev->device_id == 0x944f) ||
|
||||
(dev->device_id == 0x9456) ||
|
||||
(dev->device_id == 0x945a) ||
|
||||
(dev->device_id == 0x945b) ||
|
||||
(dev->device_id == 0x946a) ||
|
||||
(dev->device_id == 0x946b) ||
|
||||
(dev->device_id == 0x947a) ||
|
||||
(dev->device_id == 0x947b) ||
|
||||
(dev->device_id == 0x9480) ||
|
||||
(dev->device_id == 0x9487) ||
|
||||
(dev->device_id == 0x9488) ||
|
||||
(dev->device_id == 0x9489) ||
|
||||
(dev->device_id == 0x948f) ||
|
||||
(dev->device_id == 0x9490) ||
|
||||
(dev->device_id == 0x9498) ||
|
||||
(dev->device_id == 0x949e) ||
|
||||
(dev->device_id == 0x949f) ||
|
||||
(dev->device_id == 0x94c0) ||
|
||||
(dev->device_id == 0x94c1) ||
|
||||
(dev->device_id == 0x94c3) ||
|
||||
(dev->device_id == 0x94c4) ||
|
||||
(dev->device_id == 0x94c5) ||
|
||||
(dev->device_id == 0x94c6) ||
|
||||
(dev->device_id == 0x94c7) ||
|
||||
(dev->device_id == 0x94c8) ||
|
||||
(dev->device_id == 0x94c9) ||
|
||||
(dev->device_id == 0x94cb) ||
|
||||
(dev->device_id == 0x94cc) ||
|
||||
(dev->device_id == 0x9500) ||
|
||||
(dev->device_id == 0x9501) ||
|
||||
(dev->device_id == 0x9504) ||
|
||||
(dev->device_id == 0x9505) ||
|
||||
(dev->device_id == 0x9506) ||
|
||||
(dev->device_id == 0x9507) ||
|
||||
(dev->device_id == 0x9508) ||
|
||||
(dev->device_id == 0x9509) ||
|
||||
(dev->device_id == 0x950f) ||
|
||||
(dev->device_id == 0x9511) ||
|
||||
(dev->device_id == 0x9515) ||
|
||||
(dev->device_id == 0x9517) ||
|
||||
(dev->device_id == 0x9519) ||
|
||||
(dev->device_id == 0x9540) ||
|
||||
(dev->device_id == 0x9541) ||
|
||||
(dev->device_id == 0x9542) ||
|
||||
(dev->device_id == 0x954e) ||
|
||||
(dev->device_id == 0x954f) ||
|
||||
(dev->device_id == 0x9580) ||
|
||||
(dev->device_id == 0x9581) ||
|
||||
(dev->device_id == 0x9583) ||
|
||||
(dev->device_id == 0x9586) ||
|
||||
(dev->device_id == 0x9587) ||
|
||||
(dev->device_id == 0x9588) ||
|
||||
(dev->device_id == 0x9589) ||
|
||||
(dev->device_id == 0x958a) ||
|
||||
(dev->device_id == 0x958b) ||
|
||||
(dev->device_id == 0x958c) ||
|
||||
(dev->device_id == 0x958d) ||
|
||||
(dev->device_id == 0x958e) ||
|
||||
(dev->device_id == 0x958f) ||
|
||||
(dev->device_id == 0x9590) ||
|
||||
(dev->device_id == 0x9591) ||
|
||||
(dev->device_id == 0x9593) ||
|
||||
(dev->device_id == 0x9595) ||
|
||||
(dev->device_id == 0x9596) ||
|
||||
(dev->device_id == 0x9597) ||
|
||||
(dev->device_id == 0x9598) ||
|
||||
(dev->device_id == 0x9599) ||
|
||||
(dev->device_id == 0x959b) ||
|
||||
(dev->device_id == 0x95c0) ||
|
||||
(dev->device_id == 0x95c2) ||
|
||||
(dev->device_id == 0x95c4) ||
|
||||
(dev->device_id == 0x95c5) ||
|
||||
(dev->device_id == 0x95c6) ||
|
||||
(dev->device_id == 0x95c7) ||
|
||||
(dev->device_id == 0x95cc) ||
|
||||
(dev->device_id == 0x95cd) ||
|
||||
(dev->device_id == 0x95ce) ||
|
||||
(dev->device_id == 0x95cf) ||
|
||||
(dev->device_id == 0x9610) ||
|
||||
(dev->device_id == 0x9611) ||
|
||||
(dev->device_id == 0x9612) ||
|
||||
(dev->device_id == 0x9613) ||
|
||||
(dev->device_id == 0x9614)
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 5 23:42:25 CEST 2009 - sndirsch@suse.de
|
||||
|
||||
- driver-autoconfig.diff
|
||||
* ati ==> fglrx --> radeonhd --> ati
|
||||
* nv ==> nvidia --> nouveau --> nv (FATE #305109)
|
||||
* openchrome ==> chrome9 --> openchrome --> unichrome
|
||||
* registered vboxvideo
|
||||
- obsoletes radeonhd.diff/radeonhd.h
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 5 21:29:12 CEST 2009 - sndirsch@suse.de
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel
|
||||
Url: http://xorg.freedesktop.org/
|
||||
%define EXPERIMENTAL 0
|
||||
Version: 7.4
|
||||
Release: 39
|
||||
Release: 40
|
||||
License: GPL v2 or later; X11/MIT
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: System/X11/Servers/XF86_4
|
||||
@ -60,7 +60,6 @@ Source4: xorgcfg.tar.bz2
|
||||
Source5: modprobe.nvidia
|
||||
%endif
|
||||
Source7: xorg-docs-1.4.tar.bz2
|
||||
Source8: radeonhd.h
|
||||
Patch1: fpic.diff
|
||||
Patch2: p_default-module-path.diff
|
||||
Patch6: pu_fixes.diff
|
||||
@ -108,7 +107,6 @@ Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
|
||||
Patch127: dpms_screensaver.diff
|
||||
Patch128: pci-legacy-mem-fallback.diff
|
||||
Patch129: bug474071-fix1.diff
|
||||
Patch130: radeonhd.diff
|
||||
Patch131: commit-cadf65a.diff
|
||||
Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff
|
||||
Patch140: fbdev_fallback_fail_fix.diff
|
||||
@ -116,6 +114,7 @@ Patch141: bug-507190_xorg-x11-server-bnc381139-randr-fix-timestamps.diff
|
||||
Patch142: bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
|
||||
Patch143: autoconfig_fallback_fbdev_first.diff
|
||||
Patch144: keyrelease-1.5.2.diff
|
||||
Patch145: driver-autoconfig.diff
|
||||
Patch160: libdri_noPanoramiXExtension_symbol.patch
|
||||
Patch161: cache-xkbcomp-output-for-fast-start-up.patch
|
||||
Patch162: xserver-boottime.patch
|
||||
@ -238,8 +237,6 @@ popd
|
||||
pushd hw/xfree86/os-support/bus
|
||||
%patch129 -p0
|
||||
popd
|
||||
%patch130 -p1
|
||||
cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common
|
||||
%patch131 -p1
|
||||
%patch132 -p1
|
||||
%patch140 -p1
|
||||
@ -247,6 +244,7 @@ cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common
|
||||
%patch142 -p1
|
||||
%patch143 -p0
|
||||
%patch144 -p1
|
||||
%patch145 -p0
|
||||
%patch160 -p1
|
||||
%patch161 -p1
|
||||
# %patch162 -p1
|
||||
@ -579,6 +577,13 @@ exit 0
|
||||
|
||||
%changelog
|
||||
* Fri Jun 05 2009 sndirsch@suse.de
|
||||
- driver-autoconfig.diff
|
||||
* ati ==> fglrx --> radeonhd --> ati
|
||||
* nv ==> nvidia --> nouveau --> nv (FATE #305109)
|
||||
* openchrome ==> chrome9 --> openchrome --> unichrome
|
||||
* registered vboxvideo
|
||||
- obsoletes radeonhd.diff/radeonhd.h
|
||||
* Fri Jun 05 2009 sndirsch@suse.de
|
||||
- keyrelease-git.diff
|
||||
* xkb: Don't press+release keys on key events. Fixes submission
|
||||
of F7 to apps on switch from console for drivers that switch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user