Update to 21.0.2

0001-drisw-move-zink-down-the-list-below-the-sw-drivers.patch

@@ -1,72 +0,0 @@
-From 70259f75a5546d331b0d687227341f653a4bf544 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 25 Mar 2021 08:34:28 +1000
-Subject: [PATCH] drisw: move zink down the list below the sw drivers.
-
-We don't ever want drisw path picking zink as the driver,
-we can revisit this when the penny wrapper work gets further
-along.
-
-This selection causes systems with nvidia/intel dual-gpus
-to try and pick the intel gpu for rendering in the nvidia
-context if there is no nvidia GL driver or accel doesn't work.
-
-This is a partial revert of the original commit.
-
-Fixes: 4a3b42a717ce ("drisw: Prefer hardware-layered sw-winsys drivers over pure sw")
----
- src/gallium/auxiliary/target-helpers/inline_sw_helper.h | 6 +++---
- src/gallium/auxiliary/target-helpers/sw_helper.h        | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
-index c494840c44e..76eda8467b8 100644
---- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
-+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
-@@ -81,9 +81,6 @@ sw_screen_create(struct sw_winsys *winsys)
-    UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
-    const char *drivers[] = {
-       debug_get_option("GALLIUM_DRIVER", ""),
--#if defined(GALLIUM_ZINK)
--      only_sw ? "" : "zink",
--#endif
- #if defined(GALLIUM_D3D12)
-       only_sw ? "" : "d3d12",
- #endif
-@@ -95,6 +92,9 @@ sw_screen_create(struct sw_winsys *winsys)
- #endif
- #if defined(GALLIUM_SWR)
-       "swr",
-+#endif
-+#if defined(GALLIUM_ZINK)
-+      only_sw ? "" : "zink",
- #endif
-    };
- 
-diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
-index d9469d9f5e3..88a5086d261 100644
---- a/src/gallium/auxiliary/target-helpers/sw_helper.h
-+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
-@@ -86,9 +86,6 @@ sw_screen_create(struct sw_winsys *winsys)
-    UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
-    const char *drivers[] = {
-       debug_get_option("GALLIUM_DRIVER", ""),
--#if defined(GALLIUM_ZINK)
--      only_sw ? "" : "zink",
--#endif
- #if defined(GALLIUM_D3D12)
-       only_sw ? "" : "d3d12",
- #endif
-@@ -100,6 +97,9 @@ sw_screen_create(struct sw_winsys *winsys)
- #endif
- #if defined(GALLIUM_SWR)
-       "swr",
-+#endif
-+#if defined(GALLIUM_ZINK)
-+      only_sw ? "" : "zink",
- #endif
-    };
- 
--- 
-2.29.2
-

mesa.spec

@@ -56,9 +56,9 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 21.0.1
+%global ver 21.0.2
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -71,10 +71,6 @@ Source1:        Mesa-MLAA-License-Clarification-Email.txt
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4442
 Patch0:         mesa-llvm12.patch
 
-Patch1: 0001-drisw-move-zink-down-the-list-below-the-sw-drivers.patch
-# fix AMD EPYC 2-socket machines
-Patch2: cpu_caps_fixes.patch
-
 BuildRequires:  meson >= 0.45
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -616,6 +612,9 @@ popd
 %endif
 
 %changelog
+* Wed Apr 07 2021 Pete Walter <pwalter@fedoraproject.org> - 21.0.2-1
+- Update to 21.0.2
+
 * Thu Apr 01 2021 Dave Airlie <airlied@redhat.com> - 21.0.1-4
 - Backport CPU caps fixes
 

sources

@@ -1 +1 @@
-SHA512 (mesa-21.0.1.tar.xz) = b31b78778b6092dfaf0712f90de3074217574389c4236f8379c127739874f6bd1b47883140a26445d25e58df87e6207278efd048453096ee710d334b1dcfe419
+SHA512 (mesa-21.0.2.tar.xz) = c3d7969b56e1c31ee642e3b7143d565c4233173dab7cc5576b686c873c27134dc8292a9f2caa0a0dd3c54d0c89d27d6030f36a2c84f85dcedee7ae80b19e5c3b