update to 18.3.2

2 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7791a44dca3..b0184d62525b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 # Generated by mksrcinfo v8
-# Mon Nov 12 21:46:41 UTC 2018
+# Sun Jan 20 20:49:22 UTC 2019
 pkgbase = mesa-noglvnd
-	pkgver = 18.2.4
+	pkgver = 18.3.2
 	pkgrel = 1
 	url = https://www.mesa3d.org/
 	arch = x86_64
 	license = custom
-	makedepends = python2-mako
+	makedepends = python-mako
 	makedepends = libxml2
 	makedepends = libx11
 	makedepends = glproto
@@ -28,12 +28,12 @@ pkgbase = mesa-noglvnd
 	makedepends = clang
 	makedepends = libunwind
 	makedepends = lm_sensors
-	makedepends = meson
 	makedepends = libxrandr
-	source = https://mesa.freedesktop.org/archive/mesa-18.2.4.tar.xz
-	source = https://mesa.freedesktop.org/archive/mesa-18.2.4.tar.xz.sig
+	makedepends = meson
+	source = https://mesa.freedesktop.org/archive/mesa-18.3.2.tar.xz
+	source = https://mesa.freedesktop.org/archive/mesa-18.3.2.tar.xz.sig
 	source = LICENSE
-	sha512sums = 088d43b087f4005752e4db75eaa6897e0fcb6de7b9a1f2d2b2ce3b5557d1dff829022e0092e8b1038ff01182c863ca0f26c97b9adde34bca462d3fa24502bfde
+	sha512sums = 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
 	sha512sums = SKIP
 	sha512sums = f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7
 
diff --git a/PKGBUILD b/PKGBUILD
index bc3bf9976410..b0bcf96d194e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,32 @@
 # Maintainer: Vi0L0 <vi0l093@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: npfeiler
 
 pkgbase=mesa-noglvnd
 pkgname=('opencl-mesa-noglvnd' 'vulkan-intel-noglvnd' 'vulkan-radeon-noglvnd' 'libva-mesa-driver-noglvnd' 'mesa-vdpau-noglvnd' 'mesa-noglvnd' 'mesa-libgl-noglvnd')
-pkgver=18.2.4
+pkgver=18.3.2
 pkgrel=1
 arch=('x86_64')
-makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
+makedepends=('python-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
-             'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors' 'meson' 'libxrandr') # 'libglvnd')
+             'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors' # 'libglvnd'
+             'libxrandr' 'meson')
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE)
-sha512sums=('088d43b087f4005752e4db75eaa6897e0fcb6de7b9a1f2d2b2ce3b5557d1dff829022e0092e8b1038ff01182c863ca0f26c97b9adde34bca462d3fa24502bfde'
+sha512sums=('34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45'
             'SKIP'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
-              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
+              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>
               'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez@igalia.com>
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan@pnwbakers.com>
 
 prepare() {
-  cd ${srcdir}/mesa-${pkgver}
+  cd mesa-${pkgver}
 
 }
 
@@ -161,7 +163,7 @@ package_mesa-noglvnd() {
   replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa' 'mesa-git') #'mesa-libgl')
   backup=('etc/drirc')
 
-  _install fakeinstall/etc/drirc
+  _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
 #   _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
 
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
@@ -213,23 +215,23 @@ package_mesa-libgl-noglvnd() {
   conflicts=('mesa-libgl' 'mesa-libgl-git' 'libglvnd')
   replaces=('mesa-libgl' 'mesa-libgl-git')
 
-  install -m755 -d "${pkgdir}/usr/lib/"
- 
+  install -m755 -d ${pkgdir}/usr/lib
+
   ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
-  ln -s libGL.so.1.2.0	             ${pkgdir}/usr/lib/libGL.so.1
-  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so
+  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so.1
+  ln -s libGL.so.1                   ${pkgdir}/usr/lib/libGL.so
 
   ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
   ln -s libEGL.so.1.0.0	              ${pkgdir}/usr/lib/libEGL.so.1
-  ln -s libEGL.so.1.0.0               ${pkgdir}/usr/lib/libEGL.so
+  ln -s libEGL.so.1                   ${pkgdir}/usr/lib/libEGL.so
 
-  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
-  ln -s libGLESv1_CM.so.1.1.0	            ${pkgdir}/usr/lib/libGLESv1_CM.so.1
-  ln -s libGLESv1_CM.so.1.1.0               ${pkgdir}/usr/lib/libGLESv1_CM.so
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.0.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.0.0
+  ln -s libGLESv1_CM.so.1.0.0               ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1                   ${pkgdir}/usr/lib/libGLESv1_CM.so
 
   ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
   ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so.2
-  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so
+  ln -s libGLESv2.so.2                   ${pkgdir}/usr/lib/libGLESv2.so
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"