Date: Tuesday, December 22, 2009 @ 11:36:07 Author: andyrtr Revision: 61731
Merged revisions 60820,61672,61730 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-ati/trunk ........ r60820 | andyrtr | 2009-12-07 10:17:28 +0100 (Mo, 07 Dez 2009) | 2 lines upgpkg: xf86-video-ati 6.12.99.git20091207-1 new snapshot 20091207 ........ r61672 | andyrtr | 2009-12-21 18:39:02 +0100 (Mo, 21 Dez 2009) | 2 lines upgpkg: xf86-video-ati 6.12.99.git20091221-1 new snapshot 20091221 ........ r61730 | andyrtr | 2009-12-22 17:35:08 +0100 (Di, 22 Dez 2009) | 2 lines upgpkg: xf86-video-ati 6.12.4-2 back to latest stable release without new experimental codebase in libdrm to solve instability issues ........ Modified: xf86-video-ati/repos/extra-i686/ (properties) xf86-video-ati/repos/extra-i686/PKGBUILD ----------+ PKGBUILD | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) Property changes on: xf86-video-ati/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /xf86-video-ati/trunk:1-55835 + /xf86-video-ati/trunk:1-61730 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2009-12-22 16:35:08 UTC (rev 61730) +++ extra-i686/PKGBUILD 2009-12-22 16:36:07 UTC (rev 61731) @@ -3,38 +3,38 @@ # Contributor: Alexander Baldeck <alexan...@archlinux.org> pkgname=xf86-video-ati -_gitdate=20091014 -pkgver=6.12.99.git${_gitdate} # see configure.ac -#pkgver=6.12.4 -pkgrel=1 +#_gitdate=20091221 +#pkgver=6.12.99.git${_gitdate} # see configure.ac +pkgver=6.12.4 +pkgrel=2 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' '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') +depends=('libdrm>=2.4.17-2' 'libpciaccess' 'ati-dri>=7.6.1' 'pixman>=0.16.4') +makedepends=('pkgconfig' 'xorg-server>=1.7.3.901' 'fontsproto' + 'glproto>=1.4.10' 'xf86driproto' 'diffutils' 'xorg-util-macros' 'xineramaproto' 'mesa>=7.6.1') conflicts=('xorg-server<1.7.0') groups=('xorg-video-drivers') -options=('!libtool') -source=( # ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/xf86-video-ati-${_gitdate}.tar.bz2 - LICENSE) -md5sums=('d24626cad6243c7bf0d5a7bab3b578fe' +options=('!libtool' 'force') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + #ftp://ftp.archlinux.org/other/$pkgname/xf86-video-ati-${_gitdate}.tar.bz2 + LICENSE) +md5sums=('e662348f6f957fcedf52818d668ab9f5' '75da66945980a43adf1e1856271b9d4a') build() { # get git code - cd ${srcdir} +# 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 + 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"