Re: [PR PATCH] [Updated] [wip] mesa: update to 21.0.0.

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

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

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

https://github.com/HadetTheUndying/void-packages mesa-update
https://github.com/void-linux/void-packages/pull/27956

[wip] mesa: update to 21.0.0.
Reason for changing to the `-Dosmesa` argument:

https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee802372180a2b4460cc7abb53438e45c6b6f1e4

Obviously i'll be fixing the distfiles and wrksrc changes when a stable release is out.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-update-27956.patch --]
[-- Type: text/x-diff, Size: 3931 bytes --]

From 2de1758517b190f0bacc68fa68e4f3f5cec0f6ea Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 15 Jan 2021 16:25:56 -0600
Subject: [PATCH] mesa: update to 21.0.0.

---
 srcpkgs/mesa/patches/add-use-elf-tls.patch | 16 +++++++++-------
 srcpkgs/mesa/template                      | 14 +++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index 617d8c0e946..e10fdfa225b 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -2,26 +2,24 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Status: Not fixed upstream
 
 diff --git meson.build meson.build
-index d228de0..972cd79 100644
+index 932eb13..1d1a4be 100644
 --- meson.build
 +++ meson.build
-@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
- endif
+@@ -448,7 +448,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'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 +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)
    pre_args += '-DUSE_ELF_TLS'
    use_elf_tls = true
  endif
-
 diff --git meson_options.txt meson_options.txt
-index b768c15..2533220 100644
+index fc73f6e..2d9e4a2 100644
 --- meson_options.txt
 +++ meson_options.txt
-@@ -366,3 +366,9 @@ option(
+@@ -445,6 +445,12 @@ option(
    value : 25,
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
@@ -31,3 +29,7 @@ index b768c15..2533220 100644
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
+ option(
+   'zstd',
+   type : 'combo',
+
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index abfaa5031ef..2c13e0a3e05 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,11 +1,11 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.3.2
+version=21.0.0
 revision=1
-wrksrc="mesa-${version}"
+wrksrc="mesa-${version}-rc1"
 build_style=meson
-configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
- -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
+configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
+ -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=true -Dplatforms=x11,wayland
  -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
@@ -22,8 +22,8 @@ maintainer="q66 <daniel@octaforge.org>"
 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=cce001b685d23afb976b04138714906abcf7e7f996da6355e6a43e5ca486533d
+distfiles="https://mesa.freedesktop.org/archive/mesa-${version}-rc1.tar.xz"
+checksum=503c8cb70d7b0271e2c98129828772769fb7d7802514c99e9474018099f5461b
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -141,7 +141,7 @@ if [ "$_have_opencl" ]; then
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=true -Dgallium-va=true -Dgallium-xvmc=true"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=true -Dgallium-xvmc=enabled"
 	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
 else
 	configure_args+=" -Dgallium-vdpau=false -Dgallium-va=false -Dgallium-xvmc=false"