diff --git a/ati-fix-build-1.10.patch b/ati-fix-build-1.10.patch new file mode 100644 index 0000000..c3cf648 --- /dev/null +++ b/ati-fix-build-1.10.patch @@ -0,0 +1,37 @@ +From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 +From: Sedat Dilek +Date: Fri, 25 Feb 2011 21:48:14 +0100 +Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 + +This issue was introduced due to last minute backout of RandR-1.4 +in xserver 1.10-rc3. + +Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. +See also . + +Note: +The ddx needs a rebuild as the X video driver ABI changed to version 10.0. + +Reported-by: Alex Deucher +CC: Keith Packard +Signed-off-by: Sedat Dilek +--- + src/radeon_output.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/radeon_output.c b/src/radeon_output.c +index 15cef06..ccde346 100644 +--- a/src/radeon_output.c ++++ b/src/radeon_output.c +@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) + xf86CrtcPtr crtc = output->crtc; + + if (crtc->enabled) { +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) ++#ifdef RANDR_14_INTERFACE + xf86CrtcSetRec crtc_set_rec; + + crtc_set_rec.flags = (XF86CrtcSetMode | +-- +1.7.1 + diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 2d991de..246f865 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -7,7 +7,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.14.0 -Release: 3.%{gitdate}git%{gitversion}%{?dist} +Release: 4.%{gitdate}git%{gitversion}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -17,6 +17,7 @@ Source0: %{tarball}-%{gitdate}.tar.xz # unlike the other drivers, radeon.xinf is generated Source1: mkxinf +Patch5: ati-fix-build-1.10.patch Patch6: radeon-6.9.0-bgnr-enable.patch Patch10: radeon-6.12.2-lvds-default-modes.patch Patch13: fix-default-modes.patch @@ -45,6 +46,7 @@ X.Org X11 ati video driver. %prep %setup -q -n %{tarball}-%{gitdate} +%patch5 -p1 -b .fix %patch6 -p1 -b .bgnr %patch10 -p1 -b .lvds %patch13 -p1 -b .def @@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Mon Feb 28 2011 Dave Airlie 6.14.0-4.20110204gita27b5dbd9 +- rebuild with fix for 1.10 server + * Mon Feb 28 2011 Peter Hutterer - 6.14.0-3.20110204gita27b5dbd9 - Rebuild for server 1.10