[arch-commits] Commit in mesa/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, December 22, 2009 @ 11:26:47
  Author: andyrtr
Revision: 61728

Merged revisions 61727 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mesa/trunk

........
  r61727 | andyrtr | 2009-12-22 17:26:00 +0100 (Di, 22 Dez 2009) | 2 lines
  
  upgpkg: mesa 7.6.1-1
      new version 7.6.1 - disable all gallium stuff for now. we don't need it and it breaks build. disable smp build again, failed on i686
........

Modified:
  mesa/repos/extra-i686/	(properties)
  mesa/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)


Property changes on: mesa/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mesa/trunk:1-61610
   + /mesa/trunk:1-61727

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-22 16:26:00 UTC (rev 61727)
+++ extra-i686/PKGBUILD	2009-12-22 16:26:47 UTC (rev 61728)
@@ -1,12 +1,12 @@
-# $Id$
+	# $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgbase="mesa"
-pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'trident-dri' 'nouveau-dri')
-pkgver=7.6
-pkgrel=2
+pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'trident-dri') # 'nouveau-dri')
+pkgver=7.6.1
+pkgrel=1
 arch=(i686 x86_64)
-makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.15' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.1' 'libxt>=1.0.7' 'gcc-libs>=4.4.2' 'dri2proto=2.1' 'python')
+makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.17-2' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.2' 'libxt>=1.0.7' 'gcc-libs>=4.4.2' 'dri2proto=2.1' 'python')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 #options=(!makeflags)
@@ -16,8 +16,8 @@
         mesa-7.1-link-shared.patch
         intel-revert-vbl.patch
         LICENSE)
-md5sums=('8c75f90cd0303cfac9e4b6d54f6759ca'
-         '0ede7adf217951acd90dbe4551210c07'
+md5sums=('7db4617e9e10ad3aca1b64339fd71b7d'
+         'a4226f06732a02556fcf6be290b86dff'
          '6ae05158e678f4594343f32c2ca50515'
          '9eddc02e23ec08295822911e726ae89a'
          'a111f4dc82e894f8801bc3fa129af7af'
@@ -30,14 +30,15 @@
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=swrast,radeon,r200,r300,r600,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx,trident \
-    --enable-gallium-nouveau \
     --disable-gallium-intel \
-    --with-state-trackers=dri,egl \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --disable-glut || return 1
+    --disable-glut --disable-gallium || return 1
 
+#    --with-state-trackers=dri,egl \
+#    --enable-gallium-nouveau \
+
 #    --with-state-trackers=yes \   # gentoo: glx,dri,egl
 #  --disable-gallium       build gallium [default=enabled]
 #  --disable-gallium-intel build gallium intel [default=enabled]
@@ -58,7 +59,7 @@
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.15' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.17-2' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
   cd "${srcdir}/Mesa-${pkgver}" || return 1
@@ -77,7 +78,7 @@
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.3' 'libxt>=1.0.7' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.15')
+  depends=('libgl' 'libx11>=1.3.2' 'libxt>=1.0.7' 'gcc-libs>=4.4.2' 'dri2proto=2.1' 'libdrm>=2.4.17-2')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
   cd "${srcdir}/Mesa-${pkgver}" || return 1
@@ -195,10 +196,10 @@
   make -C trident DESTDIR="${pkgdir}" install || return 1
 }
 
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa Gallium3D DRI drivers for Nouveau"
+#package_nouveau-dri() {
+#  depends=("libgl=${pkgver}")
+#  pkgdesc="Mesa Gallium3D DRI drivers for Nouveau"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/nouveau/dri"
-  make DESTDIR="${pkgdir}" install || return 1
-}
+#  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/nouveau/dri"
+#  make DESTDIR="${pkgdir}" install || return 1
+#}