From 28b5bbf3fee0627993658e096eadab71c2779912 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Tue, 12 Apr 2011 10:53:36 +0000
Subject: Tue Apr 12 10:53:36 UTC 2011

---
 extra/xf86-video-ati/PKGBUILD                 | 10 +++----
 extra/xf86-video-ati/ati-fix-build-1.10.patch | 38 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 extra/xf86-video-ati/ati-fix-build-1.10.patch

(limited to 'extra/xf86-video-ati')

diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index ed379833d..bd3d1fd9e 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 114190 2011-03-11 09:27:15Z jgc $
+# $Id: PKGBUILD 115444 2011-03-18 07:49:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=6.14.0
-pkgrel=2
+pkgver=6.14.1
+pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(libpciaccess libdrm udev pixman ati-dri)
 makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.0')
+conflicts=('xorg-server<1.10.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('132a6b1ed6e03f7365659cdcf520516746a8fc27')
+md5sums=('395e23ad026e4246dd70bbd2143688b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-ati/ati-fix-build-1.10.patch b/extra/xf86-video-ati/ati-fix-build-1.10.patch
new file mode 100644
index 000000000..75980cbf3
--- /dev/null
+++ b/extra/xf86-video-ati/ati-fix-build-1.10.patch
@@ -0,0 +1,38 @@
+From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
+From: Sedat Dilek <sedat.dilek@googlemail.com>
+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 <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>
+---
+ 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
+
+
-- 
cgit v1.2.3-54-g00ecf