Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mesa.git#9b263e7cc2ff962c825975585444d1cf0b8fe67f

0001-glx-proposed-fix-for-setSwapInterval.patch

@@ -0,0 +1,33 @@
+From d2dfc356e26e607bf0808e1b5a747cc1a2699681 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 22 Feb 2021 15:57:01 +1000
+Subject: [PATCH] glx: proposed fix for setSwapInterval
+
+When mesa gets a DRI2 1.1 connection (as experienced with
+vmwware DDX) we don't get a pointer for this.
+
+Don't explode just keep going.
+
+Fixes: 60ebeb4608a8 ("glx: Implement GLX_EXT_swap_control for DRI2 and DRI3")
+---
+ src/glx/glxcmds.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
+index 7882d606554..5d5d77d4f3d 100644
+--- a/src/glx/glxcmds.c
++++ b/src/glx/glxcmds.c
+@@ -1863,8 +1863,8 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
+       __glXSendError(dpy, BadValue, interval, 0, True);
+       return;
+    }
+-
+-   pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
++   if (pdraw->psc->driScreen->setSwapInterval)
++      pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
+ #endif
+ }
+ 
+-- 
+2.26.2
+

mesa.spec

@@ -52,7 +52,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 21.0.0-rc5
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -62,6 +62,9 @@ Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
+# fix glx regression with sddm
+Patch1:         0001-glx-proposed-fix-for-setSwapInterval.patch
+
 BuildRequires:  meson >= 0.45
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -595,6 +598,9 @@ popd
 %endif
 
 %changelog
+* Mon Feb 22 2021 Dave Airlie <airlied@redhat.com> - 21.0.0~rc5-2
+- fix sddm/vmware regression
+
 * Fri Feb 19 2021 Pete Walter <pwalter@fedoraproject.org> - 21.0.0~rc5-1
 - Update to 21.0.0-rc5