From 113580a667d77bfb7e571ac4ba5f94703b8c0c65 Mon Sep 17 00:00:00 2001
From: Alexander Stefanov <alexander@mezon.ru>
Date: Fri, 3 Apr 2020 23:51:41 +0000
Subject: [PATCH] 20.0.4

---
 .abf.yml                          |  2 +-
 mesa-20.0.0-rc1-amd-non-x86.patch | 12 ------------
 mesa-20.0.3-amd-non-x86.patch     | 12 ++++++++++++
 mesa.spec                         | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 mesa-20.0.0-rc1-amd-non-x86.patch
 create mode 100644 mesa-20.0.3-amd-non-x86.patch

diff --git a/.abf.yml b/.abf.yml
index 88674a4..ddd6c24 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  mesa-20.0.2.tar.xz: c05cd6ab77577b0ce14642ab6cde295fba0256ef
+  mesa-20.0.4.tar.xz: f87988896d48015dbe53be0897a9330c6c0244d8
diff --git a/mesa-20.0.0-rc1-amd-non-x86.patch b/mesa-20.0.0-rc1-amd-non-x86.patch
deleted file mode 100644
index 32416f0..0000000
--- a/mesa-20.0.0-rc1-amd-non-x86.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h.omv~ mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h
---- mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h.omv~	2020-02-05 15:05:47.236576673 +0100
-+++ mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h	2020-02-05 15:08:09.030582925 +0100
-@@ -87,7 +87,7 @@ typedef int            INT;
- #endif
- 
- #ifndef ADDR_FASTCALL
--    #if defined(BRAHMA_ARM)
-+    #if defined(BRAHMA_ARM) || (defined(__GNUC__) && !defined(__x86_64__) && !defined(__i386__))
-         #define ADDR_FASTCALL
-     #elif defined(__GNUC__)
-         #define ADDR_FASTCALL __attribute__((regparm(0)))
diff --git a/mesa-20.0.3-amd-non-x86.patch b/mesa-20.0.3-amd-non-x86.patch
new file mode 100644
index 0000000..4aa9179
--- /dev/null
+++ b/mesa-20.0.3-amd-non-x86.patch
@@ -0,0 +1,12 @@
+diff -up mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h.2~ mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h
+--- mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h.2~	2020-04-02 13:35:20.510114470 +0200
++++ mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h	2020-04-02 13:36:48.386741907 +0200
+@@ -87,7 +87,7 @@ typedef int            INT;
+ #endif
+ 
+ #ifndef ADDR_FASTCALL
+-    #if defined(__GNUC__)
++    #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+         #define ADDR_FASTCALL __attribute__((regparm(0)))
+     #else
+         #define ADDR_FASTCALL __fastcall
diff --git a/mesa.spec b/mesa.spec
index 05b53c2..d93bb36 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -9,7 +9,7 @@
 # change me if you want release-candidate
 %define relc %{nil}
 
-%bcond_with gcc
+%bcond_without gcc
 %bcond_without opencl
 
 %{?build_selinux}%{?!build_selinux:%bcond_with selinux}
@@ -104,7 +104,7 @@
 
 Summary:	OpenGL %{opengl_ver} compatible 3D graphics library
 Name:		mesa
-Version:	20.0.2
+Version:	20.0.4
 Release:	1
 Group:		System/Libraries
 License:	MIT
@@ -129,7 +129,7 @@ Obsoletes:	%{name}-xorg-drivers-nouveau < %{EVRD}
 #Patch1:		mesa-10.2-clang-compilefix.patch
 #Patch3:		mesa-19.0.0-rc2-more-ARM-drivers.patch
 Patch1:		mesa-19.2.3-arm32-buildfix.patch
-Patch2:		mesa-20.0.0-rc1-amd-non-x86.patch
+Patch2:		mesa-20.0.3-amd-non-x86.patch
 %ifarch %{ix86}
 Patch4:		mesa-19.2.0-rc3-32bit-buildfix.patch
 %endif
@@ -1198,14 +1198,14 @@ find %{buildroot} -name '*.la' |xargs rm -f
 cat >%{buildroot}%{_libdir}/pkgconfig/glesv1_cm.pc <<'EOF'
 Name: glesv1_cm
 Description: Mesa OpenGL ES 1.1 CM library
-Version:	20.0.2
+Version:	20.0.4
 Libs: -lGLESv1_CM
 Libs.private: -lpthread -pthread -lm -ldl
 EOF
 cat >%{buildroot}%{_libdir}/pkgconfig/glesv2.pc <<'EOF'
 Name: glesv2
 Description: Mesa OpenGL ES 2.0 library
-Version:	20.0.2
+Version:	20.0.4
 Libs: -lGLESv2
 Libs.private: -lpthread -pthread -lm -ldl
 EOF
@@ -1217,7 +1217,7 @@ libdir=${prefix}/%{_libdir}
 includedir=${prefix}/include
 Name: egl
 Description: Mesa EGL Library
-Version:	20.0.2
+Version:	20.0.4
 Requires.private: x11, xext, xdamage >=  1.1, xfixes, x11-xcb, xcb, xcb-glx >=  1.8.1, xcb-dri2 >=  1.8, xxf86vm, libdrm >=  2.4.75
 Libs: -L${libdir} -lEGL
 Libs.private: -lpthread -pthread -lm -ldl