Date: Monday, August 29, 2011 @ 04:02:01 Author: jgc Revision: 136415
upgpkg: xf86-video-ati 6.14.2-2 Rebuild for xserver 1.11 Modified: xf86-video-ati/trunk/PKGBUILD Deleted: xf86-video-ati/trunk/ati-fix-build-1.10.patch --------------------------+ PKGBUILD | 8 ++++---- ati-fix-build-1.10.patch | 38 -------------------------------------- 2 files changed, 4 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-29 08:01:27 UTC (rev 136414) +++ PKGBUILD 2011-08-29 08:02:01 UTC (rev 136415) @@ -4,18 +4,18 @@ pkgname=xf86-video-ati pkgver=6.14.2 -pkgrel=1 +pkgrel=2 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.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('111ec4aef32a4298df7e38afa8bef373') +sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49') build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: ati-fix-build-1.10.patch =================================================================== --- ati-fix-build-1.10.patch 2011-08-29 08:01:27 UTC (rev 136414) +++ ati-fix-build-1.10.patch 2011-08-29 08:02:01 UTC (rev 136415) @@ -1,38 +0,0 @@ -From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 -From: Sedat Dilek <sedat.di...@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 <alexdeuc...@gmail.com> -CC: Keith Packard <kei...@keithp.com> -Signed-off-by: Sedat Dilek <sedat.di...@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 - -