mesa: Bumped to latest. refs #772

1 files changed, 245 insertions, 50 deletions

diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD
index 07f6c36..d1cc3e7 100644
--- a/abs/core/mesa/PKGBUILD
+++ b/abs/core/mesa/PKGBUILD
@@ -1,106 +1,246 @@
-# $Id: PKGBUILD 94675 2010-10-09 12:59:04Z andyrtr $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@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' 'nouveau-dri')
-pkgver=7.9
+pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
+
+#_git=true
+_git=false
+
+if [ "${_git}" = "true" ]; then
+    pkgver=7.10.99.git20110612
+  else
+    pkgver=7.10.3
+fi
 pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.22' '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')
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
+             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-        ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
-        LICENSE)
-md5sums=('82c740c49d572baa6da2b1a1eee90bca'
-         '6ae05158e678f4594343f32c2ca50515'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
+if [ "${_git}" = "true" ]; then
+	# mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2')
+  else
+	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip"
+)
+fi
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         '3ec78f340f9387abd7a37b195e764cbf'
+         '67c87b77cc2236b52a3b47dad3fbb5d4'
+         '614d063ecd170940d9ae7b355d365d59')
 
 build() {
-  # 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|" "${srcdir}/Mesa-${pkgver}"/configs/{default,autoconf.in}
-  sed -i -e "s|python|python2|" "${srcdir}/Mesa-${pkgver}"/src/gallium/auxiliary/Makefile
-
-  cd "${srcdir}/Mesa-${pkgver}"
-  ./configure --prefix=/usr \
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*   
+    autoreconf -vfi
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
+
+if [ "${_git}" != "true" ]; then
+#backport from master to fix gnome-shell shader
+#https://bugs.freedesktop.org/show_bug.cgi?id=35714
+patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
+patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+fi
+
+if [ "${_git}" = "true" ]; then
+    ./autogen.sh --prefix=/usr \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --enable-gallium-r300 \
+    --enable-gallium-r600 \
+    --enable-gallium-nouveau \
+    --enable-gallium-llvm \
+    --enable-gallium-egl \
+    --enable-gallium-swrast \
+    --enable-glx-tls \
+    --with-driver=dri \
+    --enable-xcb \
+    --with-state-trackers=dri,glx,egl \
+    --disable-glut \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-egl \
+    --enable-texture-float
+    #    --enable-gallium-svga \
+
+    # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg
+    #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply.
+
+    #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177
+    
+  else
+    ./configure --prefix=/usr \
     --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
-  make
+    --disable-glut \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-egl \
+    --disable-gallium-egl
+fi
 
-  cd "${srcdir}/gl-manpages-1.0.1"
-  ./configure --prefix=/usr
   make
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
-  cd "${srcdir}/Mesa-${pkgver}"
+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"
 
   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"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+}
+
+package_libgles() {
+  depends=('libgl')
+  pkgdesc="Mesa GLES libraries and headers"
+
+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/pkgconfig"
+  install -m755 -d "${pkgdir}/usr/include"
+  install -m755 -d "${pkgdir}/usr/include/GLES"
+  install -m755 -d "${pkgdir}/usr/include/GLES2"
+  bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
+  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
+  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
+  bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
+  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+}
+
+package_libegl() {
+  depends=('libgl')
+  pkgdesc="Mesa libEGL libraries and headers"
+
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*  
+    make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
+  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m755 -d "${pkgdir}/usr/include"
+  install -m755 -d "${pkgdir}/usr/include/"
+  install -m755 -d "${pkgdir}/usr/include/EGL"
+  install -m755 -d "${pkgdir}/usr/include/KHR"
+  install -m755 -d "${pkgdir}/usr/share"
+  install -m755 -d "${pkgdir}/usr/share/doc"
+  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
+  bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
+if [ "${_git}" != "true" ]; then
+  install -m755 -d "${pkgdir}/usr/lib/egl"
+  bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
+fi
+  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
+  bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
+  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
+  bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
 }
 
 package_mesa() {
-  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')
+  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
-  cd "${srcdir}/Mesa-${pkgver}"
+if [ "${_git}" = "true" ]; then
+    cd ${srcdir}/mesa-*   
+  else
+    cd "${srcdir}/Mesa-${pkgver}" 
+fi
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
+  rm -f "${pkgdir}/usr/lib/libGLESv"*
+  rm -f "${pkgdir}/usr/lib/libEGL"*
+  rm -rf "${pkgdir}/usr/lib/egl"
+  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
   rm -f "${pkgdir}/usr/include/GL/wglew.h"
-
-  cd "${srcdir}/gl-manpages-1.0.1"
-  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/include/GL/glut.h"
+  rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
 }
 
 package_ati-dri() {
   depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
+  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
+  #make -C r300 DESTDIR="${pkgdir}" install  <------- deprecated
   # gallium3D driver for R300 r300_dri.so
-  make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C r600 DESTDIR="${pkgdir}" install
+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
 }
 
 package_intel-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel"
 
-  cd "${srcdir}/Mesa-${pkgver}/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
@@ -110,7 +250,11 @@ package_unichrome-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -119,7 +263,11 @@ package_mach64-dri() {
   pkgdesc="Mesa DRI drivers for ATI Mach64"
   conflicts=('xf86-video-mach64<6.8.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -128,7 +276,11 @@ package_mga-dri() {
   pkgdesc="Mesa DRI drivers for Matrox"
   conflicts=('xf86-video-mga<1.4.11')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -137,7 +289,11 @@ package_r128-dri() {
   pkgdesc="Mesa DRI drivers for ATI Rage128"
   conflicts=('xf86-video-r128<6.8.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -146,7 +302,11 @@ package_savage-dri() {
   pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
   conflicts=('xf86-video-savage<2.3.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -155,7 +315,11 @@ package_sis-dri() {
   pkgdesc="Mesa DRI drivers for SiS"
   conflicts=('xf86-video-sis<0.10.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -164,7 +328,11 @@ package_tdfx-dri() {
   pkgdesc="Mesa DRI drivers for 3dfx"
   conflicts=('xf86-video-tdfx<1.4.3')
 
-  cd "${srcdir}/Mesa-${pkgver}/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
 }
 
@@ -172,11 +340,38 @@ package_nouveau-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
 
-  cd "${srcdir}/Mesa-${pkgver}/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
+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
 }
 
-
+#package_llvm-dri() {
+#  depends=("libgl=${pkgver}")
+#  pkgdesc="Mesa common LLVM support"
+
+#if [ "${_git}" = "true" ]; then
+#    cd ${srcdir}/mesa-*/src/gallium
+#  else
+#    cd "${srcdir}/Mesa-${pkgver}/src/gallium"
+#fi
+
+  # gallium llvmpipe
+#if [ "${_git}" = "true" ]; then
+#    make -C drivers/llvmpipe DESTDIR="${pkgdir}" install
+#    #make -C targets/dri-swrast DESTDIR="${pkgdir}" install
+#  else
+#    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+#fi
+#}