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

[andyrtr at archlinux.org]

    Date: Tuesday, February 15, 2011 @ 11:09:13
  Author: andyrtr
Revision: 110053

upgpkg: mesa 7.10.0.git20110215-1
update snapshot; use gallium driver for swrast fallback and for radeon r600 chips

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-15 15:11:08 UTC (rev 110052)
+++ PKGBUILD	2011-02-15 16:09:13 UTC (rev 110053)
@@ -9,11 +9,11 @@
 #_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.0.git20110206
+    pkgver=7.10.0.git20110215
   else
     pkgver=7.10
 fi
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' 
              'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'talloc' 'libxml2' 'imake')
@@ -21,14 +21,13 @@
 license=('custom')
 source=(LICENSE)
 if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-92a619b43fcd6a8778c3419ff3538c1113b4bdf3.tar.bz2
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-92a619b43fcd6a8778c3419ff3538c1113b4bdf3.tar.bz2')
+	# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
 fi
-md5sums=('6ae05158e678f4594343f32c2ca50515'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         '6dec3d97c177c486ffc060d055a73d58')
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         'f0d9daab4aaaacfd3b756dcb23b268af')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -49,7 +48,9 @@
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --disable-egl \
     --enable-gallium-radeon \
+    --enable-gallium-r600 \
     --enable-gallium-nouveau \
+    --enable-gallium-swrast \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
@@ -64,12 +65,18 @@
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --disable-egl \
     --enable-gallium-radeon \
+    --enable-gallium-r600 \
     --enable-gallium-nouveau \
+    --enable-gallium-swrast \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
     --with-state-trackers=dri,glx \
-    --disable-glut
+    --disable-glut \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-egl \
+    --disable-gallium-egl
 fi
 
   make
@@ -90,7 +97,13 @@
   bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
 
   cd src/mesa/drivers/dri
-  make -C swrast DESTDIR="${pkgdir}" install
+  #make -C swrast DESTDIR="${pkgdir}" install
+if [ "${_git}" = "true" ]; then
+    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+  else
+    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+fi
+  ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@@ -196,10 +209,12 @@
   # gallium3D driver for R300 r300_dri.so
 if [ "${_git}" = "true" ]; then
     make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
   else
     make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
 fi
-  make -C r600 DESTDIR="${pkgdir}" install
+  #make -C r600 DESTDIR="${pkgdir}" install
 }
 
 package_intel-dri() {
@@ -326,3 +341,4 @@
     make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 fi
 }
+