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

andyrtr at archlinux.org andyrtr at archlinux.org
Sun Feb 6 13:32:03 UTC 2011


    Date: Sunday, February 6, 2011 @ 08:32:03
  Author: andyrtr
Revision: 109137

upgpkg: mesa 7.10.0.git20110206-1
update to todays git shot from stable 7.10 branch, should fix some 3D bugs

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |  157 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 112 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-06 11:41:11 UTC (rev 109136)
+++ PKGBUILD	2011-02-06 13:32:03 UTC (rev 109137)
@@ -4,38 +4,49 @@
 
 pkgbase=mesa
 pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
-pkgver=7.10
-#pkgver=7.9.99.git20101230
+
+_git=true
+#_git=false
+
+if [ "${_git}" = "true" ]; then
+    pkgver=7.10.0.git20110206
+  else
+    pkgver=7.10
+fi
 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')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-	# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=aa196d047c2d42835f3f6f25ac304b312f33f4f9
-	#ftp://ftp.archlinux.org/other/mesa/mesa-aa196d047c2d42835f3f6f25ac304b312f33f4f9.tar.bz2
-        ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
+source=(ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
         LICENSE)
-md5sums=('33fb94eccc02cbb4d8d1365615e38e46'
-         '6ae05158e678f4594343f32c2ca50515'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+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')
+  else
+	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
+fi
+md5sums=('6ae05158e678f4594343f32c2ca50515'
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         '6dec3d97c177c486ffc060d055a73d58')
 
 build() {
-  cd "${srcdir}/Mesa-${pkgver}"
-#  cd ${srcdir}/mesa-*
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*   
+    autoreconf -vfi
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
 
-  # required for git build
-#  autoreconf -vfi
-
   # python2 build fixes
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
          -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $srcdir -name '*.py')
   sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" configs/{default,autoconf.in}
   sed -i -e "s|python|python2|" src/gallium/auxiliary/Makefile
 
-#  ./autogen.sh --prefix=/usr \
-  ./configure --prefix=/usr \
+if [ "${_git}" = "true" ]; then
+    ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --disable-egl \
     --enable-gallium-radeon \
@@ -44,7 +55,20 @@
     --with-driver=dri \
     --enable-xcb \
     --with-state-trackers=dri,glx \
+    --disable-glut  
+  else
+    ./configure --prefix=/usr \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --disable-egl \
+    --enable-gallium-radeon \
+    --enable-gallium-nouveau \
+    --enable-glx-tls \
+    --with-driver=dri \
+    --enable-xcb \
+    --with-state-trackers=dri,glx \
     --disable-glut
+fi
+
   make
 
   cd "${srcdir}/gl-manpages-1.0.1"
@@ -56,8 +80,11 @@
   depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
-  cd "${srcdir}/Mesa-${pkgver}"
-#  cd ${srcdir}/mesa-*
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*   
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
   install -m755 -d "${pkgdir}/usr/lib"
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
 
@@ -75,8 +102,11 @@
   depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
-  cd "${srcdir}/Mesa-${pkgver}"
-#  cd ${srcdir}/mesa-*
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*   
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
@@ -98,15 +128,21 @@
   pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C radeon DESTDIR="${pkgdir}" install
   make -C r200 DESTDIR="${pkgdir}" install
   # classic mesa driver for R300 r300_dri.so
   #make -C r300 DESTDIR="${pkgdir}" install  <------- depricated
   # gallium3D driver for R300 r300_dri.so
-  make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-#  make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+if [ "${_git}" = "true" ]; then
+    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+  else
+    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+fi
   make -C r600 DESTDIR="${pkgdir}" install
 }
 
@@ -114,8 +150,11 @@
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C i810 DESTDIR="${pkgdir}" install
   make -C i915 DESTDIR="${pkgdir}" install
   make -C i965 DESTDIR="${pkgdir}" install
@@ -125,8 +164,11 @@
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C unichrome DESTDIR="${pkgdir}" install
 }
 
@@ -135,8 +177,11 @@
   pkgdesc="Mesa DRI drivers for ATI Mach64"
   conflicts=('xf86-video-mach64<6.8.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C mach64 DESTDIR="${pkgdir}" install
 }
 
@@ -145,8 +190,11 @@
   pkgdesc="Mesa DRI drivers for Matrox"
   conflicts=('xf86-video-mga<1.4.11')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C mga DESTDIR="${pkgdir}" install
 }
 
@@ -155,8 +203,11 @@
   pkgdesc="Mesa DRI drivers for ATI Rage128"
   conflicts=('xf86-video-r128<6.8.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C r128 DESTDIR="${pkgdir}" install
 }
 
@@ -165,8 +216,11 @@
   pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
   conflicts=('xf86-video-savage<2.3.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C savage DESTDIR="${pkgdir}" install
 }
 
@@ -175,8 +229,11 @@
   pkgdesc="Mesa DRI drivers for SiS"
   conflicts=('xf86-video-sis<0.10.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C sis DESTDIR="${pkgdir}" install
 }
 
@@ -185,8 +242,11 @@
   pkgdesc="Mesa DRI drivers for 3dfx"
   conflicts=('xf86-video-tdfx<1.4.3')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
   make -C tdfx DESTDIR="${pkgdir}" install
 }
 
@@ -194,12 +254,19 @@
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-#  cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+  else
+    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+
   # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
   make -C nouveau DESTDIR="${pkgdir}" install
+
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-#  make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+if [ "${_git}" = "true" ]; then
+    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+  else
+    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+fi
 }
-




More information about the arch-commits mailing list