From 7248937a5d8026eb962092b65cc0a699158235c5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mar 19 2010 03:37:29 +0000 Subject: * Fri Mar 19 2010 Peter Hutterer 1.7.99.902-1.20100319 - Update to today's git. --- diff --git a/.cvsignore b/.cvsignore index bc29b4d..e19334d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20100304.tar.xz +xorg-server-20100319.tar.xz diff --git a/commitid b/commitid index 3c294ee..449b877 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -bbae92795c7eab062e6722c42fa7915e0cee5d69 +67a8c659f25218904bae64aac6e98e326c90330b diff --git a/sources b/sources index ed6e8d8..f1a490c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d630f8f6756f07305a781ff1f2fcc1ea xorg-server-20100304.tar.xz +c98c25437ee1cca9799bbfda721f0395 xorg-server-20100319.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 49e69a5..b05a039 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -14,12 +14,12 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20100304 +%define gitdate 20100319 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.7.99.901 -Release: 10.%{gitdate}%{dist} +Version: 1.7.99.902 +Release: 1.%{gitdate}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -82,6 +82,10 @@ Patch6051: xserver-1.7.1-gamma-kdm-fix.patch # Remove this some day. Not today though. Patch6052: xserver-1.8-udev-warning.patch +# Use vesa for VirtualBox, since we don't ship vboxvideo and the +# fallback to vesa when module is missing seems broken +Patch6053: xserver-1.8-disable-vboxvideo.patch + %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -105,7 +109,7 @@ BuildRequires: git-core BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.1.5 -BuildRequires: xorg-x11-proto-devel >= 7.4-27 +BuildRequires: xorg-x11-proto-devel >= 7.4-35 BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1 @@ -518,10 +522,19 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog -* Thu Mar 04 2010 Peter Hutterer 1.7.99.901-10.20100304 +* Fri Mar 19 2010 Peter Hutterer 1.7.99.902-1.20100319 +- Update to today's git. + +* Thu Mar 04 2010 Adam Jackson 1.7.99.901-12.20100304 +- xserver-1.6.1-nouveau.patch: Fall back to nv if nouveau won't load. (#519298) + +* Thu Mar 04 2010 Peter Hutterer 1.7.99.901-11.20100304 - Update to today's git. - BuildRequires libselinux-devel >= 2.0.86 +* Thu Feb 25 2010 Adam Jackson 1.7.99.901-10.20100223 +- xserver-1.8-disable-vboxvideo.patch: Disable vboxvideo. (adamw) + * Thu Feb 25 2010 Dave Airlie 1.7.99.901-9.20100223 - fix right-of patch to allow driver to override right-of with clone diff --git a/xserver-1.8-disable-vboxvideo.patch b/xserver-1.8-disable-vboxvideo.patch new file mode 100644 index 0000000..60c0dce --- /dev/null +++ b/xserver-1.8-disable-vboxvideo.patch @@ -0,0 +1,25 @@ +From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 25 Feb 2010 10:34:49 -0800 +Subject: [PATCH] disable vboxvideo driver in autodetect code + +--- + hw/xfree86/common/xf86AutoConfig.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7f4ada8..4e944ea 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev, + case 0x1011: driverList[0] = "tga"; break; + case 0x1023: driverList[0] = "trident"; break; + case 0x100c: driverList[0] = "tseng"; break; +- case 0x80ee: driverList[0] = "vboxvideo"; break; ++ case 0x80ee: driverList[0] = "vesa"; break; + case 0x15ad: driverList[0] = "vmware"; break; + case 0x18ca: + if (dev->device_id == 0x47) +-- +1.7.0 +