From c92a8fbbb3cc73314b2a25d9546de89e0c6487de Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 15 Mar 2009 21:08:03 -0700
Subject: Sync'd to upstream.

---
 abs/core-testing/xf86-input-synaptics/PKGBUILD |  6 +++---
 abs/core-testing/xf86-video-ati/PKGBUILD       | 23 ++++++++---------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/abs/core-testing/xf86-input-synaptics/PKGBUILD b/abs/core-testing/xf86-input-synaptics/PKGBUILD
index f92e0fd..3ce5c88 100644
--- a/abs/core-testing/xf86-input-synaptics/PKGBUILD
+++ b/abs/core-testing/xf86-input-synaptics/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 22376 2008-12-26 16:24:10Z jgc $
+# $Id: PKGBUILD 26858 2009-02-13 15:56:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xf86-input-synaptics
-pkgver=0.99.3
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="synaptics driver for notebook touchpads"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ provides=('synaptics')
 conflicts=('synaptics')
 options=(!libtool)
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('735a798e0f68c65d98e3d6b092b56d29')
+md5sums=('66dd051bb1885613d21ff7a77a7948d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/core-testing/xf86-video-ati/PKGBUILD b/abs/core-testing/xf86-video-ati/PKGBUILD
index 79faa91..1a7f5fe 100644
--- a/abs/core-testing/xf86-video-ati/PKGBUILD
+++ b/abs/core-testing/xf86-video-ati/PKGBUILD
@@ -1,30 +1,23 @@
-# $Id: PKGBUILD 22423 2008-12-26 19:32:02Z jgc $
+# $Id: PKGBUILD 24044 2009-01-12 11:44:28Z giovanni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xf86-video-ati
-pkgver=6.9.0
-pkgrel=6
+pkgver=6.10.0
+pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.3.1' 'libgl>=7.2' 'libpciaccess' 'ati-dri>=7.2')
-makedepends=('pkgconfig' 'xorg-server>=1.5.0' 'fontsproto'
+depends=('libdrm>=2.3.1' 'libpciaccess' 'ati-dri>=7.2')
+makedepends=('pkgconfig' 'xorg-server>=1.5.3' 'fontsproto'
 	     'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'xorg-util-macros')
-conflicts=('xorg-server<1.5.0')
+conflicts=('xorg-server<1.5.3')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-       git-20081021.patch)
-md5sums=('afa4873f58ae6fa31fedeb9ed31531db'
-	 'f2ce4e7fb4e266bbc61fb2d9c7c20a3b')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('6445815b12ffa4ccd1aafd43640f466d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-20081021.patch" || return 1
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr \
               --enable-dri || return 1
   make || return 1
-- 
cgit v0.12