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

[ardadem <ardadem@users.noreply.github.com>]

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

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

https://github.com/ardadem/void-packages pr-mesa21.1
https://github.com/void-linux/void-packages/pull/31473

mesa: update to 21.1.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

EDIT: tested on x86_64


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa21.1-31473.patch --]
[-- Type: text/x-diff, Size: 11331 bytes --]

From 603846e0595586af4b3338f294335a1ea71304c4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 14 Jun 2021 11:03:33 +0300
Subject: [PATCH] mesa: update to 21.1.3.

---
 srcpkgs/mesa/patches/add-use-elf-tls.patch    | 17 ++--
 ...b2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch | 87 -------------------
 ...cd957879ff642cfd921dda6e8b04dd35fec4.patch | 25 ------
 srcpkgs/mesa/patches/musl.patch               | 20 +++--
 srcpkgs/mesa/template                         | 18 ++--
 5 files changed, 33 insertions(+), 134 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch
 delete mode 100644 srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch

diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index c9bbceb45f3b..420665ea8377 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -2,24 +2,24 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Status: Not fixed upstream
 
 diff --git meson.build meson.build
-index 932eb13..1d1a4be 100644
+index e1e94e71049..96ab3fb3e45 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -448,7 +448,8 @@ endif
+@@ -447,7 +447,8 @@ endif
  
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
  use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
 +with_use_elf_tls = get_option('use-elf-tls')
-+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29)
++if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and with_use_elf_tls and
+     (not with_platform_android or get_option('platform-sdk-version') >= 29) and
+     (not with_platform_windows or not with_shared_glapi))
    pre_args += '-DUSE_ELF_TLS'
-   use_elf_tls = true
- endif
 diff --git meson_options.txt meson_options.txt
-index fc73f6e..2d9e4a2 100644
+index a7030aba31e..966cfeca298 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -445,6 +445,12 @@ option(
+@@ -446,6 +446,12 @@ option(
    value : 25,
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
@@ -32,4 +32,3 @@ index fc73f6e..2d9e4a2 100644
  option(
    'zstd',
    type : 'combo',
-
diff --git a/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch b/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch
deleted file mode 100644
index 04bdacdb3463..000000000000
--- a/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Wed, 24 Feb 2021 12:44:41 +0100
-Subject: [PATCH] clover: Fix build with llvm-12.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build error after LLVM commit c495dfe0268b ("[clang][cli] NFC:
-Decrease the scope of ParseLangArgs parameters").
-
-../src/gallium/frontends/clover/llvm/invocation.cpp: In function ‘std::unique_ptr<clang::CompilerInstance> {anonymous}::create_compiler_instance(const clover::device&, const string&, const std::vector<std::__cxx11::basic_string<char> >&, std::string&)’:
-../src/gallium/frontends/clover/llvm/invocation.cpp:252:55: error: cannot convert ‘clang::PreprocessorOptions’ to ‘std::vector<std::__cxx11::basic_string<char> >&’
-  252 |                                 c->getPreprocessorOpts(),
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~
-      |                                                       |
-      |                                                       clang::PreprocessorOptions
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4114
-Signed-off-by: Karol Herbst <kherbst@redhat.com>
-Reviewed-by: Francisco Jerez <currojerez@riseup.net>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8543>
----
- src/gallium/frontends/clover/llvm/compat.hpp  | 22 +++++++++++++++----
- .../frontends/clover/llvm/invocation.cpp      |  5 ++---
- 2 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
-index 78eb8c982a8..d537819f292 100644
---- a/src/gallium/frontends/clover/llvm/compat.hpp
-+++ b/src/gallium/frontends/clover/llvm/compat.hpp
-@@ -38,14 +38,14 @@
- 
- #include <llvm/Config/llvm-config.h>
- 
-+#include <llvm/ADT/Triple.h>
-+#include <llvm/Analysis/TargetLibraryInfo.h>
-+#include <llvm/IR/LegacyPassManager.h>
- #include <llvm/IR/LLVMContext.h>
- #include <llvm/Linker/Linker.h>
-+#include <llvm/Target/TargetMachine.h>
- #include <llvm/Transforms/IPO.h>
- #include <llvm/Transforms/Utils/Cloning.h>
--#include <llvm/Target/TargetMachine.h>
--
--#include <llvm/IR/LegacyPassManager.h>
--#include <llvm/Analysis/TargetLibraryInfo.h>
- 
- #include <clang/Basic/TargetInfo.h>
- #include <clang/Frontend/CompilerInstance.h>
-@@ -88,6 +88,20 @@ namespace clover {
-                cinv, copts.data(), copts.data() + copts.size(), diag);
- #endif
-          }
-+
-+         static inline void
-+         compiler_set_lang_defaults(std::unique_ptr<clang::CompilerInstance> &c,
-+                                    clang::InputKind ik, const ::llvm::Triple& triple,
-+                                    clang::LangStandard::Kind d)
-+         {
-+            c->getInvocation().setLangDefaults(c->getLangOpts(), ik, triple,
-+#if LLVM_VERSION_MAJOR >= 12
-+                                               c->getPreprocessorOpts().Includes,
-+#else
-+                                               c->getPreprocessorOpts(),
-+#endif
-+                                               d);
-+         }
-       }
-    }
- }
-diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
-index 536e952b100..30592e4343b 100644
---- a/src/gallium/frontends/clover/llvm/invocation.cpp
-+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
-@@ -247,9 +247,8 @@ namespace {
-       // http://www.llvm.org/bugs/show_bug.cgi?id=19735
-       c->getDiagnosticOpts().ShowCarets = false;
- 
--      c->getInvocation().setLangDefaults(c->getLangOpts(),
--                                compat::ik_opencl, ::llvm::Triple(target.triple),
--                                c->getPreprocessorOpts(),
-+      compat::compiler_set_lang_defaults(c, compat::ik_opencl,
-+                                ::llvm::Triple(target.triple),
-                                 get_language_version(opts, device_clc_version));
- 
-       c->createDiagnostics(new clang::TextDiagnosticPrinter(
diff --git a/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch b/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch
deleted file mode 100644
index 04dbd861d423..000000000000
--- a/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f0dccd957879ff642cfd921dda6e8b04dd35fec4 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 2 Mar 2021 20:09:39 +0100
-Subject: [PATCH] clover: Add missing include for llvm-12 build fix
-
-Fixes: d1eab2b1eb1 ("clover: Fix build with llvm-12.")
-Signed-off-by: Karol Herbst <kherbst@redhat.com>
-Reviewed-by: Francisco Jerez <currojerez@riseup.net>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9372>
----
- src/gallium/frontends/clover/llvm/compat.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
-index d537819f292..380d16a8346 100644
---- a/src/gallium/frontends/clover/llvm/compat.hpp
-+++ b/src/gallium/frontends/clover/llvm/compat.hpp
-@@ -49,6 +49,7 @@
- 
- #include <clang/Basic/TargetInfo.h>
- #include <clang/Frontend/CompilerInstance.h>
-+#include <clang/Lex/PreprocessorOptions.h>
- 
- #if LLVM_VERSION_MAJOR >= 10
- #include <llvm/Support/CodeGen.h>
diff --git a/srcpkgs/mesa/patches/musl.patch b/srcpkgs/mesa/patches/musl.patch
index 46db8d747377..6417c5c80e59 100644
--- a/srcpkgs/mesa/patches/musl.patch
+++ b/srcpkgs/mesa/patches/musl.patch
@@ -32,15 +32,14 @@
  #endif
 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -28,6 +28,8 @@
- #ifndef RADV_AMDGPU_WINSYS_H
- #define RADV_AMDGPU_WINSYS_H
+@@ -30,6 +30,7 @@
  
+ #include <amdgpu.h>
+ #include <pthread.h>
 +#include <sys/types.h>
-+
- #include "radv_radeon_winsys.h"
+ #include "util/list.h"
+ #include "util/rwlock.h"
  #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"
 --- a/src/gallium/frontends/nine/nine_debug.c	2020-03-06 07:46:48.278918421 +0100
 +++ b/src/gallium/frontends/nine/nine_debug.c	2020-03-06 07:51:32.919964119 +0100
 @@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
@@ -52,3 +51,12 @@
  
      if (first) {
          first = FALSE;
+@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
+ 
+ #if defined(HAVE_PTHREAD)
+     if (dbg_flags & DBG_TID)
+-        tid = (unsigned long)pthread_self();
++        tid = pthread_self();
+ #endif
+ 
+     if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 414c918c7baf..312c51832195 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.0.3
-revision=4
+version=21.1.3
+revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -23,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=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b
+checksum=cbe221282670875ffd762247b6a2c95dcee91d0a34c29802c75ef761fc891e69
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -155,7 +155,10 @@ _dri_drivers=${_dri_drivers/=,/=}
 configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	configure_args+=" -Dvulkan-device-select-layer=true -Dvulkan-overlay-layer=true"
+	configure_args+=" -Dvulkan-layers=device-select,overlay"
+	if [ "$_have_intel" ]; then
+		configure_args+=",intel-nullhw"
+	fi
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
@@ -344,9 +347,10 @@ mesa-vulkan-radeon_package() {
 mesa-vulkan-overlay-layer_package() {
 	short_desc="Vulkan layer to display information about the running application"
 	pkg_install() {
-		vmove usr/bin/mesa-overlay-control.py
-		vmove usr/lib/libVkLayer_MESA_overlay.so
-		vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
+		vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
+		vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
+		vmove "usr/bin/mesa-overlay-control.py"
+		vmove "usr/lib/libVkLayer_*.so"
 	}
 }