From ea967bf73c92b9cbedca028595eaf2b6a97730d3 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 29 Jun 2020 17:17:59 +0200
Subject: [PATCH] mesa: update to 20.1.2

Also switch to default dri drivers path
---
 srcpkgs/mesa/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 2fe556daed6..21218e86f3c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.1.1
-revision=2
+version=20.1.2
+revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://www.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3ea6e46ea7881c656f7b4724639eaa4672d4e0e0b70869651e8f955ebae3d476
+checksum=283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb
 
 build_options="wayland"
 build_options_default="wayland"
@@ -168,8 +168,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 case "$XBPS_TARGET_MACHINE" in
-	i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/xorg/modules/drivers";;
-	*) configure_args+=" -Ddri-drivers-path=/usr/lib/xorg/modules/drivers";;
+	i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
 esac
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -271,10 +270,10 @@ mesa-dri_package() {
 	shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
 	pkg_install() {
 		# Only strip each megadriver once, via its master filename
-		nostrip_files=$(find "${DESTDIR}/usr/lib/xorg/modules/drivers" \
-		 ! -name 'libmesa_dri_drivers.so' ! -name 'libgallium_dri.so'  \
+		nostrip_files=$(find "${DESTDIR}/usr/lib/dri" \
+		 ! -name 'libmesa_dri_drivers.so' ! -name 'libgallium_dri.so' \
 		  -type f -printf '%f ')
-		vmove "usr/lib/xorg/modules/drivers";
+		vmove "usr/lib/dri"
 		if [ -d "$DESTDIR/usr/lib/gallium-pipe" ]; then
 			vmove "usr/lib/gallium-pipe/pipe_*.so"
 		fi