# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1654340144 14400
# Node ID 488e12ffbd2911cfe06adc54e9b5ee4a2cabab88
# Parent  53c6991c2c648f53b7c7402edd33422b718e3685
mesa: update to v22.1.1

* src/mesa.mk: update to v22.1.1, add update rule

* src/mesa-2-ucrt.patch: update patch

diff -r 53c6991c2c64 -r 488e12ffbd29 src/mesa-2-ucrt.patch
--- a/src/mesa-2-ucrt.patch	Fri Jun 03 13:55:56 2022 -0400
+++ b/src/mesa-2-ucrt.patch	Sat Jun 04 06:55:44 2022 -0400
@@ -3,17 +3,6 @@
 Date: Sat, 16 Oct 2021 16:50:46 -0700
 Subject: [PATCH] mesa: fixes for UCRT.
 
---- mesa-21.2.4/src/compiler/spirv/vtn_private.h.orig	2021-10-16 15:28:02.537761600 -0700
-+++ mesa-21.2.4/src/compiler/spirv/vtn_private.h	2021-10-16 15:28:05.959391400 -0700
-@@ -41,7 +41,7 @@
- struct vtn_decoration;
- 
- /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */
--#ifdef __MINGW32__
-+#if defined(__MINGW32__) && !defined(_UCRT)
-   #define vtn_setjmp __builtin_setjmp
-   #define vtn_longjmp __builtin_longjmp
- #else
 --- mesa-21.2.4/src/compiler/nir/nir.h.orig	2021-10-14 12:59:05.367845000 -0700
 +++ mesa-21.2.4/src/compiler/nir/nir.h	2021-10-16 15:55:09.881268400 -0700
 @@ -54,7 +54,7 @@
@@ -25,16 +14,3 @@
  #define snprintf _snprintf
  #endif
  
---- mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c.orig	2021-10-14 12:59:05.375845200 -0700
-+++ mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c	2021-10-16 15:55:30.818804300 -0700
-@@ -27,10 +27,6 @@
- #include "nir.h"
- #include "nir_builder.h"
- 
--#if defined(_WIN32) && !defined(snprintf)
--#define snprintf _snprintf
--#endif
--
- /*
-  * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot
-  * (info.num_ssbos).
diff -r 53c6991c2c64 -r 488e12ffbd29 src/mesa.mk
--- a/src/mesa.mk	Fri Jun 03 13:55:56 2022 -0400
+++ b/src/mesa.mk	Sat Jun 04 06:55:44 2022 -0400
@@ -2,16 +2,17 @@
 # See index.html for further information.
 
 PKG             := mesa
-$(PKG)_VERSION  := 22.0.4
-$(PKG)_CHECKSUM := 1176b18ab25596b551e7f0d1379b4b230e7ea666
+$(PKG)_VERSION  := 22.1.1
+$(PKG)_CHECKSUM := 3c6ad85c1f6542babcf96fbaa5c9315a36de478c
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
 $(PKG)_DEPS     := build-mako build-meson build-ninja expat zlib llvm s2tc
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- https://archive.mesa3d.org | \
+    $(SED) -n 's|.*href=\"mesa-\([0-9][0-9\.]*\)\.tar.xz\".*|\1|p' | $(SORT) -V | \
+    tail -1
 endef
 
 # FIXME: Should this be defined in the top-level Makefile?