Fix building against xorg-server-1.10, patch taken from upstream git

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

3 files changed, 44 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index b0ceabb70983..1fc47036f9b3 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.139 2011/02/18 12:41:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.140 2011/02/28 16:07:18 chithanh Exp $
+
+  28 Feb 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-ati-6.14.0.ebuild,
+  +files/xf86-video-ati-6.14.0-xorg-server-1.10.patch:
+  Fix building against xorg-server-1.10, patch taken from upstream git
 
   18 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -xf86-video-ati-6.12.6.ebuild, xf86-video-ati-6.12.7.ebuild,
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch
new file mode 100644
index 000000000000..5b47bc05a3d7
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch
@@ -0,0 +1,33 @@
+From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
+From: Sedat Dilek <sedat.dilek@googlemail.com>
+Date: Fri, 25 Feb 2011 20:48:14 +0000
+Subject: 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 <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
+
+Note:
+The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
+
+Reported-by: Alex Deucher <alexdeucher@gmail.com>
+CC: Keith Packard <keithp@keithp.com>
+Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
+---
+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 |
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild
index 40f1745daccd..127ffaad447d 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild,v 1.4 2011/02/14 23:56:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild,v 1.5 2011/02/28 16:07:18 chithanh Exp $
 
 EAPI=3
 inherit xorg-2
@@ -22,6 +22,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xproto"
 
+PATCHES=(
+	"${FILESDIR}/${P}-xorg-server-1.10.patch"
+)
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="