packages: xorg-driver-video-ati/xorg-driver-video-ati.spec, xorg-driver-vid...

[witekfl]

Author: witekfl                      Date: Thu Mar  3 12:41:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added patch from Gentoo with compilation fix
- rel still 2 

---- Files affected:
packages/xorg-driver-video-ati:
   xorg-driver-video-ati.spec (1.76 -> 1.77) , xf86-video-ati-6.14.0-xorg-server-1.10.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-ati/xorg-driver-video-ati.spec
diff -u packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.76 packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.77
--- packages/xorg-driver-video-ati/xorg-driver-video-ati.spec:1.76	Sun Feb 27 09:32:20 2011
+++ packages/xorg-driver-video-ati/xorg-driver-video-ati.spec	Thu Mar  3 13:41:32 2011
@@ -8,6 +8,7 @@
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-%{version}.tar.bz2
 # Source0-md5:	b64bf8939f9f8fb518baf858f8b6ca73
+Patch0:		xf86-video-ati-6.14.0-xorg-server-1.10.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
@@ -133,6 +134,7 @@
 
 %prep
 %setup -q -n xf86-video-ati-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -172,6 +174,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2011/03/03 12:41:32  witekfl
+- added patch from Gentoo with compilation fix
+- rel still 2
+
 Revision 1.76  2011/02/27 08:32:20  arekm
 - release 2
 

================================================================
Index: packages/xorg-driver-video-ati/xf86-video-ati-6.14.0-xorg-server-1.10.patch
diff -u /dev/null packages/xorg-driver-video-ati/xf86-video-ati-6.14.0-xorg-server-1.10.patch:1.1
--- /dev/null	Thu Mar  3 13:41:37 2011
+++ packages/xorg-driver-video-ati/xf86-video-ati-6.14.0-xorg-server-1.10.patch	Thu Mar  3 13:41:32 2011
@@ -0,0 +1,33 @@
+From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
+From: Sedat Dilek <sedat.dilek at 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 at gmail.com>
+CC: Keith Packard <keithp at keithp.com>
+Signed-off-by: Sedat Dilek <sedat.dilek at 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-ati/xorg-driver-video-ati.spec?r1=1.76&r2=1.77&f=u