diff options
Diffstat (limited to 'extra/xf86-video-ati')
| -rw-r--r-- | extra/xf86-video-ati/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/xf86-video-ati/ati-fix-build-1.10.patch | 38 |
2 files changed, 5 insertions, 43 deletions
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index 47b339cd1..ce97f1169 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ +# $Id: PKGBUILD 140344 2011-10-11 21:29:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati pkgver=6.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati video driver" arch=(i686 x86_64 'mips64el') 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}" diff --git a/extra/xf86-video-ati/ati-fix-build-1.10.patch b/extra/xf86-video-ati/ati-fix-build-1.10.patch deleted file mode 100644 index 75980cbf3..000000000 --- a/extra/xf86-video-ati/ati-fix-build-1.10.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - - |