[arch-commits] Commit in xf86-video-ati/repos (4 files)

[Jan de Groot]

    Date: Tuesday, October 11, 2011 @ 17:29:32
  Author: jgc
Revision: 140343

db-move: moved xf86-video-ati from [testing] to [extra] (i686)

Added:
  xf86-video-ati/repos/extra-i686/PKGBUILD
    (from rev 140271, xf86-video-ati/repos/testing-i686/PKGBUILD)
Deleted:
  xf86-video-ati/repos/extra-i686/PKGBUILD
  xf86-video-ati/repos/extra-i686/ati-fix-build-1.10.patch
  xf86-video-ati/repos/testing-i686/

--------------------------+
 PKGBUILD                 |   62 ++++++++++++++++++++++-----------------------
 ati-fix-build-1.10.patch |   38 ---------------------------
 2 files changed, 31 insertions(+), 69 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-11 21:29:31 UTC (rev 140342)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:32 UTC (rev 140343)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.2
-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.10.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('111ec4aef32a4298df7e38afa8bef373')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-ati/repos/extra-i686/PKGBUILD (from rev 140271, xf86-video-ati/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:32 UTC (rev 140343)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-video-ati
+pkgver=6.14.2
+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>=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)
+sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make "DESTDIR=${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-i686/ati-fix-build-1.10.patch
===================================================================
--- extra-i686/ati-fix-build-1.10.patch	2011-10-11 21:29:31 UTC (rev 140342)
+++ extra-i686/ati-fix-build-1.10.patch	2011-10-11 21:29:32 UTC (rev 140343)
@@ -1,38 +0,0 @@
-From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
-From: Sedat Dilek <sedat.dilek at 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 at gmail.com>
-CC: Keith Packard <keithp at keithp.com>
-Signed-off-by: Sedat Dilek <sedat.dilek at 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
-
-