[arch-commits] Commit in xf86-video-ati/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Wednesday, October 14, 2009 @ 13:26:48
  Author: andyrtr
Revision: 55835

Merged revisions 55834 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-ati/trunk

........
  r55834 | andyrtr | 2009-10-14 17:25:59 +0000 (Wed, 14 Oct 2009) | 2 lines
  
  upgpkg: xf86-video-ati 6.12.99.git20091014-1
      switch to a fresh git shot; should give everybody 3d with KMS
........

Modified:
  xf86-video-ati/repos/testing-x86_64/	(properties)
  xf86-video-ati/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)


Property changes on: xf86-video-ati/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-ati/trunk:1-55513
   + /xf86-video-ati/trunk:1-55834

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-10-14 17:25:59 UTC (rev 55834)
+++ testing-x86_64/PKGBUILD	2009-10-14 17:26:48 UTC (rev 55835)
@@ -1,27 +1,40 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
+
 pkgname=xf86-video-ati
-pkgver=6.12.4
-pkgrel=2
+_gitdate=20091014
+pkgver=6.12.99.git${_gitdate} # see configure.ac
+#pkgver=6.12.4
+pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.15' 'libpciaccess' 'ati-dri>=7.6')
+depends=('libdrm>=2.4.15' 'libpciaccess' 'ati-dri>=7.6' 'pixman>=0.16.2')
 makedepends=('pkgconfig' 'xorg-server>=1.7.0' 'fontsproto'
 	     'glproto>=1.4.10' 'xf86driproto' 'diffutils' 'xorg-util-macros' 'xineramaproto' 'mesa>=7.6')
 conflicts=('xorg-server<1.7.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('e662348f6f957fcedf52818d668ab9f5'
+source=( # ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	ftp://ftp.archlinux.org/other/$pkgname/xf86-video-ati-${_gitdate}.tar.bz2
+	 LICENSE)
+md5sums=('d24626cad6243c7bf0d5a7bab3b578fe'
          '75da66945980a43adf1e1856271b9d4a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --enable-dri || return 1
+  # get git code
+  cd ${srcdir}
+#  git clone -v git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
+#  cd xf86-video-ati
+#  git archive --prefix=xf86-video-ati-${_gitdate}/ --format=tar HEAD | bzip2 > ../../xf86-video-ati-${_gitdate}.tar.bz2
+#  return 1
+
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"*
+  ./autogen.sh --prefix=/usr --enable-dri || return 1
+#  ./configure --prefix=/usr --enable-dri || return 1
   make || return 1
   make "DESTDIR=${pkgdir}" install || return 1
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"