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

No need to --disable-xaa explicitly anymore.

Browse Source
This commit is contained in:
Adam Jackson 2012-07-30 12:27:26 -04:00
parent 10e9e1ad9d
commit 1b5034bf0e
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xorg-x11-server.spec
View File

@ -43,7 +43,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.12.99.903 Version: 1.12.99.903
Release: 4%{?gitdate:.%{gitdate}}%{dist} Release: 5%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -74,10 +74,6 @@ Source31: xserver-sdk-abi-requires.git
# maintainer convenience script # maintainer convenience script
Source40: driver-abi-rebuild.sh Source40: driver-abi-rebuild.sh
# OpenGL compositing manager feature/optimization patches.
# FIXME: who calls this?
#Patch103: xserver-1.5.0-bg-none-root.patch
# Trivial things to never merge upstream ever: # Trivial things to never merge upstream ever:
# This really could be done prettier. # This really could be done prettier.
Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5002: xserver-1.4.99-ssh-isnt-local.patch
@ -386,7 +382,6 @@ autoreconf -f -v --install || exit 1
--with-os-name="$(hostname -s) $(uname -r)" \ --with-os-name="$(hostname -s) $(uname -r)" \
--with-xkb-output=%{_localstatedir}/lib/xkb \ --with-xkb-output=%{_localstatedir}/lib/xkb \
--with-dtrace \ --with-dtrace \
--disable-xaa \
--enable-xselinux --enable-record \ --enable-xselinux --enable-record \
--enable-config-udev \ --enable-config-udev \
%{dri_flags} %{?bodhi_flags} \ %{dri_flags} %{?bodhi_flags} \
@ -574,6 +569,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Mon Jul 30 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-5
- No need to --disable-xaa explicitly anymore.
* Thu Jul 26 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-4 * Thu Jul 26 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-4
- Install xserver-sdk-abi-requires.release based on stable_abi not gitdate, - Install xserver-sdk-abi-requires.release based on stable_abi not gitdate,
so drivers built against a server that Provides multiple ABI versions will so drivers built against a server that Provides multiple ABI versions will

25
xserver-1.8-disable-vboxvideo.patch
View File

@ -1,25 +0,0 @@
From 8f5d13bea017198598dcbbcc86d6ada06fc0fdc4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <adamwill@shaw.ca>
Date: Thu, 25 Feb 2010 10:34:49 -0800
Subject: [PATCH 5/9] disable vboxvideo driver in autodetect code
---
hw/xfree86/common/xf86pciBus.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 26d6cad..4640ede 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1167,7 +1167,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.4.4