diff --git a/SOURCES/SFML-fix-compilation-mesa.patch b/SOURCES/SFML-fix-compilation-mesa.patch
new file mode 100644
index 0000000..57e1d0d
--- /dev/null
+++ b/SOURCES/SFML-fix-compilation-mesa.patch
@@ -0,0 +1,18 @@
+diff --git a/src/SFML/Window/Unix/GlxExtensions.hpp b/src/SFML/Window/Unix/GlxExtensions.hpp
+index abbb132ae..fb2c7da8f 100644
+--- a/src/SFML/Window/Unix/GlxExtensions.hpp
++++ b/src/SFML/Window/Unix/GlxExtensions.hpp
+@@ -28,11 +28,12 @@
+ #ifndef SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
+ #define SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
+ 
+-#ifdef __glxext_h_
++#if defined(__glxext_h_) || defined(__glx_glxext_h_)
+ #error Attempt to include glx_exts after including glxext.h
+ #endif
+ 
+ #define __glxext_h_
++#define __glx_glxext_h_
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
diff --git a/SPECS/SFML.spec b/SPECS/SFML.spec
index 849f7b4..441dc9f 100644
--- a/SPECS/SFML.spec
+++ b/SPECS/SFML.spec
@@ -1,6 +1,6 @@
 Name:           SFML
 Version:        2.4.2
-Release:        5%{?dist}
+Release:        5%{?dist}.alma
 Summary:        Simple and Fast Multimedia Library
 
 # src/SFML/Audio/stb_vorbis/stb_vorbis.{c,h} are Public Domain
@@ -33,6 +33,9 @@ Patch1:         SFML-do-not-use-Pong-trademark.patch
 # Upstream issue - https://github.com/SFML/SFML/issues/1187
 Patch2:         SFML-strict-aliasing.patch
 
+# Patch for compilation with the latest version of mesa
+Patch9999:      SFML-fix-compilation-mesa.patch
+
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  freetype-devel
@@ -68,6 +71,9 @@ developing applications that use %{name}.
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+
+%patch9999 -p1
+
 # fixup non needed executable permission on regular files
 find -type f -print0 | xargs -0 chmod -x
 # fixup %%doc files line endings
@@ -111,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
 
 %changelog
+* Mon Nov 01 2021 Eduard Abdullin <eabdullin@cloudlinux.com> - 2.4.2-5.alma
+- Patch for latest mesa
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild