diff --git a/.cvsignore b/.cvsignore index e2d8d65..bc29b4d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20100223.tar.xz +xorg-server-20100304.tar.xz diff --git a/commitid b/commitid index 9f21396..3c294ee 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -93ff1bc5884cdfca1132af7fbc06c48e06f218c8 +bbae92795c7eab062e6722c42fa7915e0cee5d69 diff --git a/sources b/sources index 349faa3..ed6e8d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55513ab7f893cf75c75ffc3186ec1aff xorg-server-20100223.tar.xz +d630f8f6756f07305a781ff1f2fcc1ea xorg-server-20100304.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 54c552f..a8b541f 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 20100223 +%define gitdate 20100304 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.7.99.901 -Release: 10.%{gitdate}%{dist} +Release: 11.%{gitdate}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -131,7 +131,7 @@ BuildRequires: mesa-libGL-devel >= 7.6-0.6 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 kernel-headers -BuildRequires: audit-libs-devel libselinux-devel >= 2.0.79-1 +BuildRequires: audit-libs-devel libselinux-devel >= 2.0.86-1 BuildRequires: libudev-devel # All server subpackages have a virtual provide for the name of the server @@ -522,6 +522,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* 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) diff --git a/xserver-1.6.99-default-modes.patch b/xserver-1.6.99-default-modes.patch index 171c8a7..0f0ba27 100644 --- a/xserver-1.6.99-default-modes.patch +++ b/xserver-1.6.99-default-modes.patch @@ -1,6 +1,6 @@ -From 8cdd51d13aa003c888cd2a3a42664e2dc60c354c Mon Sep 17 00:00:00 2001 +From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001 From: Adam Jackson -Date: Wed, 20 Jan 2010 14:55:12 +1300 +Date: Thu, 4 Mar 2010 15:18:38 +1000 Subject: [PATCH] tweak default mode list yet again --- @@ -8,10 +8,10 @@ Subject: [PATCH] tweak default mode list yet again 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 23f4a87..0ce631a 100644 +index 03277be..571ffd0 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1578,7 +1578,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) +@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) int min_clock = 0; int max_clock = 0; double clock; @@ -19,8 +19,8 @@ index 23f4a87..0ce631a 100644 + Bool add_default_modes; Bool debug_modes = config->debug_modes || xf86Initialising; - enum { sync_config, sync_edid, sync_default } sync_source = sync_default; -@@ -1623,6 +1623,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + enum det_monrec_source sync_source = sync_default; +@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) } output_modes = (*output->funcs->get_modes) (output); @@ -31,5 +31,5 @@ index 23f4a87..0ce631a 100644 edid_monitor = output->MonInfo; -- -1.6.6 +1.6.6.1