[arch-commits] Commit in mesa/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, October 11, 2009 @ 16:26:02
  Author: andyrtr
Revision: 54939

upgpkg: mesa 7.6-1
    new version 7.6; add nouveau-gallium3d support

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-11 20:25:47 UTC (rev 54938)
+++ PKGBUILD	2009-10-11 20:26:02 UTC (rev 54939)
@@ -2,22 +2,22 @@
 # 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')
-pkgver=7.5.1
-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
+pkgrel=1
 arch=(i686 x86_64)
-makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.13' 'libxxf86vm>=1.0.99.1' 'libxdamage>=1.1.1' 'expat>=2.0.1' 'libx11>=1.2.2' 'libxt>=1.0.6' 'gcc-libs>=4.4.1' 'dri2proto=2.1')
+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' 'libxt>=1.0.7' 'gcc-libs>=4.4.1' 'dri2proto=2.1')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-options=(!makeflags)
+#options=(!makeflags)
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaDemos-${pkgver}.tar.bz2
         ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
         mesa-7.1-link-shared.patch
         intel-revert-vbl.patch
         LICENSE)
-md5sums=('877d6a4b24efc2b1d02aa553f262cba8'
-         '785402e3b9f0e335538fcc6bf19f6987'
+md5sums=('8c75f90cd0303cfac9e4b6d54f6759ca'
+         '0ede7adf217951acd90dbe4551210c07'
          '6ae05158e678f4594343f32c2ca50515'
          '9eddc02e23ec08295822911e726ae89a'
          'a111f4dc82e894f8801bc3fa129af7af'
@@ -30,10 +30,25 @@
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=swrast,radeon,r200,r300,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx,trident \
+    --enable-gallium-nouveau \
+    --with-state-trackers=dri,egl \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
     --disable-glut || return 1
+
+#    --with-state-trackers=yes \   # gentoo: glx,dri,egl
+#  --disable-gallium       build gallium [default=enabled]
+#  --disable-gallium-intel build gallium intel [default=enabled]
+#  --enable-gallium-radeon build gallium radeon [default=disabled]
+#  --enable-gallium-nouveau build gallium nouveau [default=disabled]
+
+#ls src/Mesa-7.6/src/mesa/drivers/dri/
+#common  dri.pc.in  fb  ffb  gamma  glcore  i810  i915  i965  intel  mach64  mga  r128  r200  r300  r600  radeon  s3v  savage  sis  swrast  tdfx  trident  unichrome
+#ls src/Mesa-7.6/src/gallium/drivers/
+#cell  failover  i915simple  i965simple  identity  llvmpipe  nouveau  nv04  nv10  nv20  nv30  nv40  nv50  r300  softpipe  trace
+
+    
   make || return 1
 
   cd "${srcdir}/gl-manpages-1.0.1"
@@ -42,7 +57,7 @@
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.13' 'libxxf86vm>=1.0.99.1' 'libxdamage>=1.1.1' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.15' '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
@@ -61,7 +76,7 @@
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.2.2' 'libxt' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.13')
+  depends=('libgl' 'libx11>=1.3' 'libxt>=1.0.7' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.15')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
   cd "${srcdir}/Mesa-${pkgver}" || return 1
@@ -102,7 +117,8 @@
   make -C i915 DESTDIR="${pkgdir}" install || return 1
   make -C i965 DESTDIR="${pkgdir}" install || return 1
 
-  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel/egl"
+#  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel/egl"
+  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel"
   make DESTDIR="${pkgdir}" install || return 1
 }
 
@@ -176,3 +192,11 @@
   cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
   make -C trident DESTDIR="${pkgdir}" install || return 1
 }
+
+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
+}