Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/darkhttpd/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpicview/PKGBUILD
	community/iftop/PKGBUILD
	community/lazarus/PKGBUILD
	community/netsurf/PKGBUILD
	community/polkit-gnome/PKGBUILD
	community/texvc/PKGBUILD
	community/unbound/PKGBUILD
	community/xfmedia/PKGBUILD
	core/glibc/PKGBUILD
	extra/arora/PKGBUILD
	extra/cairo/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/libmng/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/sqlite/PKGBUILD
	libre/midori-libre/PKGBUILD
	~fauno/distccd-zeroconf/PKGBUILD
	~fauno/kyotocabinet/PKGBUILD
	~fauno/kyototycoon/PKGBUILD

1 files changed, 12 insertions, 13 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 24e1d6822..fd09645b6 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $
+# $Id: PKGBUILD 193703 2013-08-28 15:19:08Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
-pkgver=9.1.6
+pkgver=9.2.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
-             'wayland' 'systemd')
+             'wayland' 'elfutils' 'llvm' 'systemd')
 if [ "$CARCH" != "mips64el" ]; then
   pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   makedepends+=('libvdpau' 'llvm-amdgpu-snapshot')
@@ -16,9 +16,9 @@ fi
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('443a2a352667294b53d56cb1a74114e9'
+md5sums=('4185b6aae890bc62a964f4b24cc1aca8'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
@@ -37,11 +37,11 @@ build() {
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+    --with-egl-platforms=x11,drm,wayland \
     --with-llvm-shared-libs \
     --enable-gallium-llvm \
     --enable-egl \
     --enable-gallium-egl \
-    --with-egl-platforms=x11,drm,wayland \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
@@ -57,9 +57,10 @@ build() {
     # --help
 
     make
+
     # fake installation
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall install
+    mkdir $srcdir/fakeinstall
+    make DESTDIR=${srcdir}/fakeinstall install
 }
 
 package_ati-dri() {
@@ -98,10 +99,8 @@ package_nouveau-dri() {
   optdepends=('libtxc_dxtn: S3 Texture Compressed support')
   depends=("mesa-libgl=${pkgver}")
 
-  # vdpau driver is problematic, so remove it (FS#36004)
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
-  rm -rf ${pkgdir}/usr/lib/vdpau/
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -115,7 +114,7 @@ package_nouveau-dri() {
 
 package_svga-dri() {
   pkgdesc="Gallium3D VMware guest GL driver"
-  depends=('libdrm' 'expat' 'llvm-amdgpu-lib-snapshot')
+  depends=('libdrm' 'expat' 'llvm-libs')
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -129,12 +128,12 @@ package_svga-dri() {
 
 package_mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd')
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
-  [ "$CARCH" != "mips64el" ] && depends+=('libvdpau' 'llvm-amdgpu-lib-snapshot')
+  [ "$CARCH" != "mips64el" ] && depends+=('libvdpau')
 
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
   # rename libgl.so to not conflict with blobs - may break gl.pc ?