From 6bd9234996c98d7e3d8dc3a8d09183cb714808fe Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 20 Aug 2021 11:08:35 +0300
Subject: [PATCH] mesa: update to 21.2.1.

* add new crocus gallium driver
* remove obsolete musl patches
---
 srcpkgs/mesa/patches/musl.patch | 34 ++++++++++++---------------------
 srcpkgs/mesa/template           |  6 +++---
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/mesa/patches/musl.patch b/srcpkgs/mesa/patches/musl.patch
index 6417c5c80e59..61a8f016dafe 100644
--- a/srcpkgs/mesa/patches/musl.patch
+++ b/srcpkgs/mesa/patches/musl.patch
@@ -1,25 +1,3 @@
---- a/src/gallium/winsys/svga/drm/vmw_screen.h	2015-05-07 14:02:28.033079796 +0200
-+++ b/src/gallium/winsys/svga/drm/vmw_screen.h	2015-05-07 14:02:48.832054666 +0200
-@@ -35,6 +35,8 @@
- #define VMW_SCREEN_H_
- 
- 
-+#include <sys/types.h> 	/* dev_t */
-+
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
- 
---- a/src/gallium/frontends/nine/threadpool.h	2015-05-07 14:10:53.443337212 +0200
-+++ b/src/gallium/frontends/nine/threadpool.h	2015-05-07 14:11:04.210307653 +0200
-@@ -24,6 +24,8 @@
- #ifndef _THREADPOOL_H_
- #define _THREADPOOL_H_
- 
-+#include <pthread.h>
-+
- #define MAXTHREADS 1
- 
- struct threadpool {
 --- a/src/util/rand_xor.c	2020-10-03 12:27:48.489024729 +0200
 +++ b/src/util/rand_xor.c	2020-10-03 12:31:05.927113521 +0200
 @@ -28,6 +28,7 @@
@@ -60,3 +38,15 @@
  #endif
  
      if (dbg_flags & flag) {
+--- a/src/gallium/drivers/freedreno/freedreno_util.h
++++ b/src/gallium/drivers/freedreno/freedreno_util.h
+@@ -106,6 +106,9 @@ extern bool fd_binning_enabled;
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/syscall.h>
++
++#define gettid() ((pid_t)syscall(SYS_gettid))
+ 
+ #define DBG(fmt, ...)                                                          \
+    do {                                                                        \
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..5d067c4ff302 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.2.1
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -83,7 +83,7 @@ fi
 
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
-	_gallium_drivers+=",iris"
+	_gallium_drivers+=",crocus,iris"
 	_vulkan_drivers+=",intel"
 	_dri_drivers+=",i915,i965"
 	subpackages+=" mesa-vulkan-intel"