Merge branch '3.5' into 3.6

Conflicts:
	mesa/.signature
	mesa/Pkgfile

mesa/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndFUhg8SnYOhz7+eBPwVwe/9+qpDtZkJkVBC0ypJrXeeQbEAAxGF5aAh/mNIzIq5hcH7V+zaCt5QdhmCGqzMaiA8=
-SHA256 (Pkgfile) = 741eee0c43ef797f4402391bb7885b7050b77d0db33acab5a629768d95c19e9f
+RWTSGWF5Q7TndEP2lQzoZk8E6kHTsT54e/oC9WNYWLB/4HN0O0K0gnaxQ1dm5O2KBC1v7T2D82Xs2qeWtQ+7dkhuXs7ImWw+5Q0=
+SHA256 (Pkgfile) = 6c8ff18bdb840b6bbd475952b72f3f2d76f7e7798a6055ecc02a4d2e4384c1e2
 SHA256 (.footprint) = 68f502c4699284136e261b85197c12ff5c7a3a637cd249a2a878097267520385
-SHA256 (mesa-20.2.1.tar.xz) = d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a
+SHA256 (mesa-20.2.2.tar.xz) = 1f93eb1090cf71490cd0e204e04f8427a82b6ed534b7f49ca50cea7dcc89b861

mesa/Pkgfile

@@ -5,7 +5,7 @@
 # Optional: libva
 
 name=mesa
-version=20.2.1
+version=20.2.2
 release=1
 source=(https://mesa.freedesktop.org/archive/$name-$version.tar.xz)
 
@@ -14,15 +14,15 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--buildtype=plain \
-		-D llvm=true \
-		-D gbm=true \
-		-D gles1=true \
-		-D gles2=true \
+		-D llvm=enabled \
+		-D shared-llvm=enabled \
+		-D gbm=enabled \
+		-D gles1=enabled \
+		-D gles2=enabled \
 		-D osmesa=gallium \
-		-D gallium-xa=true \
-		-D gallium-vdpau=true \
-		-D shared-llvm=true \
-		-D platforms=x11,drm \
+		-D gallium-xa=enabled \
+		-D gallium-vdpau=enabled \
+		-D platforms=x11 \
 		-D gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau \
 		-D vulkan-drivers=amd,intel \
 		-D glvnd=true