[PR PATCH] mesa: update to 22.2.0.

[PR PATCH] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

There is a new pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 1058 bytes --]

From 341ee4872e290c1e761d158c6e0ec538394ccc93 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7128 bytes --]

From a459df2db3080fb0e67bf1e0bd7375dd321cec91 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 srcpkgs/mesa/patches/add-use-elf-tls.patch    | 33 ----------------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 14 ++++---
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 10 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 delete mode 100644 srcpkgs/mesa/patches/add-use-elf-tls.patch
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
deleted file mode 100644
index 6bb599d2475e..000000000000
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
-+option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
- option(
-   'zstd',
-   type : 'combo',
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..86fd516f4112 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-09-20 17:01:37.000000000 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:03:15.243716828 -0400
+@@ -255,18 +255,34 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -19,7 +17,7 @@ index 45cb6075e6..1a2ea1a450 100644
      if (!pack) return thrd_nomem;
      pack->func = func;
      pack->arg = arg;
--    if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
+     if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
 +    if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
 +#ifndef __GLIBC__
 +        pthread_attr_destroy(&attr);
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7741 bytes --]

From d005d52e202d01c63a7ce16a527c79481d4d0d9d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 14 ++++---
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 22 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..86fd516f4112 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-09-20 17:01:37.000000000 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:03:15.243716828 -0400
+@@ -255,18 +255,34 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -19,7 +17,7 @@ index 45cb6075e6..1a2ea1a450 100644
      if (!pack) return thrd_nomem;
      pack->func = func;
      pack->arg = arg;
--    if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
+     if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
 +    if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
 +#ifndef __GLIBC__
 +        pthread_attr_destroy(&attr);
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7795 bytes --]

From 14973fde72fbb1d7b0496c9aa896f4d1937c0cdf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 17 ++++----
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 24 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..ed20818714c7 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:29:55.451149654 -0400
+@@ -255,18 +255,35 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -19,7 +17,7 @@ index 45cb6075e6..1a2ea1a450 100644
      if (!pack) return thrd_nomem;
      pack->func = func;
      pack->arg = arg;
--    if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
+     if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
 +    if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
 +#ifndef __GLIBC__
 +        pthread_attr_destroy(&attr);
@@ -31,5 +29,10 @@ index 45cb6075e6..1a2ea1a450 100644
 +    pthread_attr_destroy(&attr);
 +#endif
      return thrd_success;
++  }
  }
- 
+
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7387 bytes --]

From 2af65384fa8bf89f6dc94ca21640617aad9ffa7c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 13 ++++---
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..3b68bbad4292 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ src/c11/impl/threads_posix.new.c	2022-10-04 16:36:29.532136641 -0400
+@@ -255,18 +255,34 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -31,5 +29,10 @@ index 45cb6075e6..1a2ea1a450 100644
 +    pthread_attr_destroy(&attr);
 +#endif
      return thrd_success;
++  }
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7387 bytes --]

From 1b9fb534e455e8817e4b085d561f0cfc42086da4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 13 ++++---
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..4a8bc440b00d 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:36:29.532136641 -0400
+@@ -255,18 +255,34 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -31,5 +29,10 @@ index 45cb6075e6..1a2ea1a450 100644
 +    pthread_attr_destroy(&attr);
 +#endif
      return thrd_success;
++  }
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7335 bytes --]

From 00082c3dfdfa235fb564e198ef3a7562b32b5e55 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  4 +-
 5 files changed, 21 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..0f40c5abc462 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: mesa: update to 22.2.0.

[Visone-Selektah]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

New comment by Visone-Selektah on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268022441

Comment:
Hi!
Mesa 22.2 has disable vaapi for amd gpu. This option is now disable by default
   -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc
   
If void gonna keep this option disable, at least a warning for those users would be fine.
Thanks!!

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268379108

Comment:
Didn't even noticed, don't use it a lot. Will try to mess around and enable it.

Re: mesa: update to 22.2.0.

[Visone-Selektah]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New comment by Visone-Selektah on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268453791

Comment:
Hi!
Just enable this option for amd or in hwdec function
     -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc

 In case or intel or nvidia doesn't matter, they got that support by external pkgs

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268514127

Comment:
Well, I can't get shotcut to export with vaapi. And looking all over I see other distros and legal bs. Past bumps have been just bumps. Someone else with a better understanding and more time may want to look at this.

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268514127

Comment:
Well, I can't get shotcut to export with vaapi. And looking all over I see other distros and legal bs. Past bumps have been just bumps. Someone else with a better understanding and more time may want to look at this.

Thanks visone

Re: mesa: update to 22.2.0.

[Visone-Selektah]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

New comment by Visone-Selektah on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268561164

Comment:
Hi!
As far as I know the legal bs only affect to US companies, but like you said, maybe someone with a better understanding should take a look at this.
Anyway, maybe a post-install warning about it would be fine so the users can be aware of this change. 

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7829 bytes --]

From d0b096d0ae476fe7c870cd74eb40b1930784314e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  7 ++--
 5 files changed, 23 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..fc7e32845a97 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14
+ -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
@@ -22,7 +23,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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268693380

Comment:
Verified I'm not crazy and just dumb (what's new?), packages are put into their own directory for builds done in a branch. vaapi works fine with new commit.

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268695314

Comment:
I should probably put those args into the amd section though

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7591 bytes --]

From d42363e40c7ba9d6e9d82d48adbc4db2ffd9f9ff Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..720191ff8a85 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+  configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: mesa: update to 22.2.0.

[Visone-Selektah]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by Visone-Selektah on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1268698486

Comment:
Hi!
Better this way, in amd section.
Thanks!!!!

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7590 bytes --]

From 32e2296c15852f183e87103d22920b7e151fe459 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..521ccf12b155 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.0
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: mesa: update to 22.2.0.

[RicArch97]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

New comment by RicArch97 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1272546112

Comment:
The `.0` versions of Mesa are development releases as described in the [release notes](https://docs.mesa3d.org/relnotes/22.2.0.html):
> Mesa 22.2.0 is a new development release. People who are concerned with stability and reliability should stick with a previous release or wait for Mesa 22.2.1.

Which Void also follows, so it's usually better to just wait for the `.1` release.

Re: mesa: update to 22.2.0.

[Visone-Selektah]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New comment by Visone-Selektah on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1275301347

Comment:
Hi!
Mesa 22.2.1 has been released

Re: mesa: update to 22.2.0.

[HadetTheUndying]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1280029400

Comment:
@zlice checking with you before I open a PR for 22.2.1 are you still working on this?

Re: mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1280030426

Comment:
> @zlice checking with you before I open a PR for 22.2.1 are you still working on this?

if you got it go for it, i can close this

Re: mesa: update to 22.2.0.

[HadetTheUndying]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1280061265

Comment:
> > @zlice checking with you before I open a PR for 22.2.1 are you still working on this?
> 
> if you got it go for it, i can close this

Looks like all you'd need to do is bump the version number and update the checksums. run `xbump`, squash and force push. It's Hacktoberfest so I'd prefer you get the commit since you did the work.

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7588 bytes --]

From b3b82563cb7628f84a38405fcef7b149071ebdc6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa:update to 22.2.1

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..ac3d309b3040 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: [PR PATCH] [Updated] mesa: update to 22.2.0.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7588 bytes --]

From 01377fb497e8d0a9133920ebebdcd7d1ecdd2381 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa:update to 22.2.1

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..ac3d309b3040 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: mesa: update to 22.2.1.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1284484092

Comment:
https://gitlab.freedesktop.org/mesa/mesa/-/tags/mesa-22.2.2

Re: mesa: update to 22.2.1.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 923 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1288099750

Comment:
Seems to work on my end (OnePlus 5T / `aarch64-musl`)
```diff
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.1
+version=22.2.2
 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=0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c
+checksum=2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9
 
 build_options="wayland"
 build_options_default="wayland"
```

Re: mesa: update to 22.2.1.

[HadetTheUndying]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1288161194

Comment:
Yeah I'll open a fresh PR tomorrow or you can if @zlice is too busy. 

Re: [PR PATCH] [Updated] mesa: update to 22.2.1.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7588 bytes --]

From 0af8a70c3a623639c2c340af16d67bd6071f028d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa:update to 22.2.2

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..3f3ac658c58c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.2
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: [PR PATCH] [Updated] mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7588 bytes --]

From 615177865e2444fce9ba30fd89d9f7ec6a73e507 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa:update to 22.2.2

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  5 ++-
 5 files changed, 22 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..3f3ac658c58c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.2
 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=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1288162109

Comment:
Updated again .-. This happened the last time too. Keep kicking versions down the road but don't have testing then a new version comes out, repeat. Last opinion was to update something that's known and working. Haven't tested this yet fyi.

Re: mesa: update to 22.2.2.

[HadetTheUndying]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1296433318

Comment:
I think it's safe to say that this can be merged. It's been a week no reports of major problems from the upstream and I haven't noticed any issues on my systems.

Re: mesa: update to 22.2.2.

[HadetTheUndying]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1325640804

Comment:
`mesa-23.0.0` just landed which means we're probably only a few weeks away from stable. I still feel that this is ready to be merged. 

Re: mesa: update to 22.2.2.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1327336330

Comment:
Been running these updated packages on my `x86_64-glibc` AMDGPU system for a month now, no problems so far.

Re: mesa: update to 22.2.2.

[123randomuser321]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

New comment by 123randomuser321 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328107212

Comment:
It seems cross-builds from glibc to musl (which iirc the Void's build system does) are broken for `mesa`.
Tested with x86_64-glibc --> x86_64-musl and x86_64-glibc --> aarch64-musl.
x86_64-glibc --> aarch64-glibc works.

I was able to reproduce the issue with the current upstream template (22.1.7).

Should we try to fix the issue here, or make a seperate issue/PR?
Also, someone testing musl --> glibc cross would be appreciated (kinda slow with binfmts).


Error looks like this:
`=> mesa-22.1.7_1: running do_build ...`
`ninja: Entering directory 'build'`
`ninja: error: '/usr/x86_64-linux-musl/usr/lib/libm.so', needed by 'src/amd/vulkan/libvulkan_radeon.so', missing and no known rule to make it`

Re: mesa: update to 22.2.2.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328108791

Comment:
@123randomuser321 Afaik `glibc` -> `musl` cross builds are NOT supported in general, see [Building packages natively for the musl C library](https://github.com/void-linux/void-packages#building-for-musl).

Re: mesa: update to 22.2.2.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328108791

Comment:
@123randomuser321 Afaik `glibc` -> `musl` (or vice versa) cross builds are NOT supported in general, see [Building packages natively for the musl C library](https://github.com/void-linux/void-packages#building-for-musl).

Re: mesa: update to 22.2.2.

[123randomuser321]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

New comment by 123randomuser321 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328109413

Comment:
@JamiKettunen 
Thx for the quick respone :)

I did test that, and it works (tested with x86_64-musl and aarch64-musl masterdir).

But doesn't the build infrastructure only utilise a x86_64-glibc host system, with a matching masterdir?
If i do remember correctly, and it does indeed, we should fix this issue, since having `mesa` be a broken pkg is a no-no, imo.

Re: mesa: update to 22.2.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328109975

Comment:
It uses a musl masterdir for musl targets and a glibc masterdir for glibc targets. What the host system uses doesn't matter.

Re: mesa: update to 22.2.2.

[123randomuser321]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New comment by 123randomuser321 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1328112149

Comment:
@paper42 @JamiKettunen Then consider my point moot.
I was under the assumption that being able to build glibc --> musl was necessary.

Re: [PR REVIEW] mesa: update to 22.2.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032960038

Comment:
22.2.4 is available

Re: [PR REVIEW] mesa: update to 22.2.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032959947

Comment:
```suggestion
changelog="https://docs.mesa3d.org/relnotes.html"
```

Re: [PR REVIEW] mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032975671

Comment:
Commit message matter? Was going to be lazy and use github's UI

Re: [PR REVIEW] mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032975727

Comment:
This has happened a few times. The new versions come and then this won't get merged because it's not tested and then it keeps recycling.

Re: [PR REVIEW] mesa: update to 22.2.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032976389

Comment:
don't change the commit message, just force push to this PR

Re: [PR REVIEW] mesa: update to 22.2.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032976745

Comment:
patch releases only fix bugs, we should use the latest version available

Re: [PR REVIEW] mesa: update to 22.2.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032976758

Comment:
the changes in .3 and .4 are small. test it for a little bit and i'll merge

Re: [PR REVIEW] mesa: update to 22.2.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032976745

Comment:
.patch releases only fix bugs, we should use the latest version available, it's important to test the 22.2 release series, later patch releases should only fix issues.

Re: [PR PATCH] [Updated] mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7742 bytes --]

From 430a70e0e8ba331a06901bc19067bbd96bcdfa15 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.4

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  7 ++--
 5 files changed, 23 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..2fef72b292dc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.4
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -20,9 +20,9 @@ short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
-changelog="https://docs.mesa3d.org/relnotes/${version}.html"
+changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: [PR PATCH] [Updated] mesa: update to 22.2.2.

[zlice]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages mesa_22.2.0
https://github.com/void-linux/void-packages/pull/39722

mesa: update to 22.2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**


A patch file from https://github.com/void-linux/void-packages/pull/39722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa_22.2.0-39722.patch --]
[-- Type: text/x-diff, Size: 7742 bytes --]

From 3b1e515dbdf78d7e600bf4a28d57c3be6052dde2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 4 Oct 2022 15:47:21 -0400
Subject: [PATCH] mesa: update to 22.2.4

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 -------------------
 ...se-elf-tls.patch => add-elf-use-tls.patch} | 28 ++++++-------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/patches/musl-stacksize.patch     | 12 +++---
 srcpkgs/mesa/template                         |  7 ++--
 5 files changed, 23 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 rename srcpkgs/mesa/patches/{add-use-elf-tls.patch => add-elf-use-tls.patch} (57%)
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 725a306ec30b..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
similarity index 57%
rename from srcpkgs/mesa/patches/add-use-elf-tls.patch
rename to srcpkgs/mesa/patches/add-elf-use-tls.patch
index 6bb599d2475e..c9a154e4ccea 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-elf-use-tls.patch
@@ -1,33 +1,29 @@
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-Status: Not fixed upstream
---- a/meson.build  2022-05-02 16:58:59.796354436 -0400
-+++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
-@@ -490,8 +490,11 @@
+--- a/meson.build	2022-09-20 17:01:37.000000000 -0400
++++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
+@@ -504,6 +504,11 @@
    pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
  endforeach
-
--use_elf_tls = true
--pre_args += '-DUSE_ELF_TLS'
-+#use_elf_tls = true
+ 
 +use_elf_tls = get_option('use-elf-tls')
 +if use_elf_tls
 +  pre_args += '-DUSE_ELF_TLS'
 +endif
-
++
  if with_platform_android and get_option('platform-sdk-version') >= 29
    # By default the NDK compiler, at least, emits emutls references instead of
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
-   value : 25,
+   # ELF TLS, even when building targeting newer API levels.  Make it actually do
+--- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
++++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
+@@ -472,6 +472,12 @@
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
-+option(
+ option(
 +  'use-elf-tls',
 +  type : 'boolean',
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
- option(
++option(
    'zstd',
    type : 'combo',
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch
index be2f5d454f59..cf5b2cd1fb91 100644
--- a/srcpkgs/mesa/patches/musl-stacksize.patch
+++ b/srcpkgs/mesa/patches/musl-stacksize.patch
@@ -1,8 +1,6 @@
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
+--- a/src/c11/impl/threads_posix.c	2022-10-04 16:30:04.564345425 -0400
++++ b/src/c11/impl/threads_posix.c	2022-10-04 16:43:51.794135619 -0400
+@@ -255,18 +255,33 @@
  thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
  {
      struct impl_thrd_param *pack;
@@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
      return thrd_success;
  }
  
++
+ // 7.25.5.2
+ thrd_t
+ thrd_current(void)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6b86c2895bfd..2fef72b292dc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.7
+version=22.2.4
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -20,9 +20,9 @@ short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
-changelog="https://docs.mesa3d.org/relnotes/${version}.html"
+changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
+checksum=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
 
 build_options="wayland"
 build_options_default="wayland"
@@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
+	configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
 fi
 
 if [ "$_have_intel" ]; then

Re: [PR REVIEW] mesa: update to 22.2.4.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New review comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1032987771

Comment:
Will update locally too and test gaming, browsing etc. I would normally do on my system

Re: [PR REVIEW] mesa: update to 22.2.4.

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New review comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1037028249

Comment:
Tested with media in mpv, pale moon, some games, seems ok'ish here.. (x86_64-glib - radeonsi)

Re: [PR REVIEW] mesa: update to 22.2.4.

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New review comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#discussion_r1037028249

Comment:
Tested with media in mpv, pale moon, some games, seems ok'ish here.. (x86_64-glib - radeonsi)
edit v.22.2.4

Re: [PR PATCH] [Merged]: mesa: update to 22.2.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

There's a merged pull request on the void-packages repository

mesa: update to 22.2.4.
https://github.com/void-linux/void-packages/pull/39722

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture **x86_64**

Re: mesa: update to 22.2.4.

[q66]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1335951835

Comment:
this PR silently breaks the megadriver symlinking that i previously fixed

why didn't that get reviewed

Re: mesa: update to 22.2.4.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1336134270

Comment:
Now that I look at the diff (I was just testing the new mesa upgrade before as I'm just a user in the end) why was `0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch` also dropped? I don't see anything like that upstream, or did I miss something?

Patches shouldn't just be dropped at random if they don't apply cleanly anymore, we had them in the package for a reason. On the other hand these should've definitely been caught in the review and asked about.

Re: mesa: update to 22.2.4.

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1336134270

Comment:
Now that I look at the diff (I was just testing the new mesa upgrade before as I'm just a user in the end) why was `0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch` also dropped? I don't see [anything like that upstream](https://gitlab.freedesktop.org/mesa/mesa/-/commits/22.2/src/gallium/drivers/radeonsi/si_buffer.c), or did I miss something?

Patches shouldn't just be dropped at random if they don't apply cleanly anymore, we had them in the package for a reason. On the other hand these should've definitely been caught in the review and asked about.

Re: mesa: update to 22.2.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1336247278

Comment:
#40896 

Re: mesa: update to 22.2.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39722#issuecomment-1336247278

Comment:
The aarch64 patch only needed a small change to apply, and the megadriver symlink patch applied completely fine without modification, so I'm not sure why it was removed.

#40896