[arch-commits] Commit in xf86-video-r128/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Monday, August 3, 2009 @ 16:00:28
  Author: jgc
Revision: 48768

Merged revisions 48767 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-r128/trunk

........
  r48767 | jgc | 2009-08-03 22:00:11 +0200 (Mon, 03 Aug 2009) | 2 lines
  
  upgpkg: xf86-video-r128 6.8.1-1
      Move 3D driver to its own package
........

Modified:
  xf86-video-r128/repos/extra-x86_64/	(properties)
  xf86-video-r128/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)


Property changes on: xf86-video-r128/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-r128/trunk:1-46536
   + /xf86-video-r128/trunk:1-48767

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-03 20:00:11 UTC (rev 48767)
+++ extra-x86_64/PKGBUILD	2009-08-03 20:00:28 UTC (rev 48768)
@@ -1,25 +1,20 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-r128
-pkgver=6.8.0
-pkgrel=6
-_mesaver="7.5"
+pkgver=6.8.1
+pkgrel=1
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.12' "libgl>=${_mesaver}" 'expat')
-makedepends=('pkgconfig' 'xorg-server>=1.6.2' "mesa>=${_mesaver}" 'glproto>=1.4.9' 'xf86driproto' 'diffutils' 'dri2proto' 'xineramaproto')
-conflicts=('xorg-server<1.6.2')
+depends=('glibc' 'r128-dri')
+makedepends=('pkgconfig' 'xorg-server>=1.6.3' "mesa>=7.5" 'glproto>=1.4.9' 'xf86driproto' 'xineramaproto')
+conflicts=('xorg-server<1.6.3')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-       http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
-       mesa-7.1-link-shared.patch
        LICENSE)
-md5sums=('007bec0c6b07d9d3aeca4da18e561efb'
-         '459f332551f6ebb86f384d21dd15e1f0'
-         '9eddc02e23ec08295822911e726ae89a'
+md5sums=('2b90854a62a4d45d652062f582dc8d13'
          '97ad034bea2a153f4418a6bb0c77acf4')
 
 build() {
@@ -28,23 +23,5 @@
               --enable-dri || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-
-  cd "${srcdir}/Mesa-${_mesaver}"
-  patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
-  ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-dri-drivers=r128 \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glu \
-    --disable-glut \
-    --disable-glw || return 1
-  make || return 1
-  cd src/mesa/drivers/dri || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }