rpms/xorg-x11-server/F-11 xserver-1.6.2-vboxvideo.patch, NONE, 1.1 xorg-x11-server.spec, 1.452, 1.453

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32282

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.2-vboxvideo.patch 
Log Message:
* Fri Jul 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1.6.2-2
- Add vboxvideo driver to the autodetection routine


xserver-1.6.2-vboxvideo.patch:

--- NEW FILE xserver-1.6.2-vboxvideo.patch ---
>From f8079585cd68ad2e742d611bdf9908dc6db5a4a9 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Fri, 10 Jul 2009 16:26:25 +0200
Subject: [PATCH] Add vboxvideo to the autodetection routine

---
 hw/xfree86/common/xf86AutoConfig.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 056497e..14f075f 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -232,6 +232,7 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x100c:		    driverList[0] = "tseng";	break;
 	case 0x1106:		    driverList[0] = "openchrome"; break;
 	case 0x15ad:		    driverList[0] = "vmware";	break;
+	case 0x80ee:		    driverList[0] = "vboxvideo"; break;
 	case 0x18ca:
 	    if (dev->device_id == 0x47)
 		driverList[0] = "xgixp";
-- 
1.6.2.5



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- xorg-x11-server.spec	8 Jul 2009 22:13:01 -0000	1.452
+++ xorg-x11-server.spec	10 Jul 2009 14:30:33 -0000	1.453
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,6 +113,9 @@ Patch6045: xserver-1.6.1-pea-quirk.patch
 
 Patch6046: xserver-1.6.1-fix-glx-drawable.patch
 
+# #510238, already upstream
+Patch6047: xserver-1.6.2-vboxvideo.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -529,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1.6.2-2
+- Add vboxvideo driver to the autodetection routine
+
 * Wed Jul 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.2-1
 - xserver 1.6.2