$ git diff --patch-with-stat --summary a1e360babc8fcdd0ed99be8d57efaaa5afab9dca..437d8acad9d1d03dee4bec5ac00e40e57c1eb418

 .abf.yml                          |  2 +-
 mesa-20.0.0-rc1-amd-non-x86.patch | 12 ------------
 mesa-20.0.3-amd-non-x86.patch     | 12 ++++++++++++
 mesa.spec                         | 15 ++++++---------
 4 files changed, 19 insertions(+), 22 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 f898077..ddd6c24 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  mesa-20.0.2.tar.xz: c05cd6ab77577b0ce14642ab6cde295fba0256ef
\ No newline at end of file
+  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 3c2617e..d53b766 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -119,7 +119,7 @@
 
 Summary:	OpenGL %{opengl_ver} compatible 3D graphics library
 Name:		mesa
-Version:	20.0.2
+Version:	20.0.4
 %if "%{relc}%{git}" == ""
 Release:	1
 %else
@@ -156,11 +156,8 @@ Obsoletes:	%{name}-xorg-drivers < %{EVRD}
 Obsoletes:	%{name}-xorg-drivers-radeon < %{EVRD}
 Obsoletes:	%{name}-xorg-drivers-nouveau < %{EVRD}
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=74098
-#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
@@ -460,7 +457,7 @@ Requires:	%{_lib}GL1%{?_isa}
 Provides:	mesa-libGL%{?_isa} = %{EVRD}
 Requires:	%mklibname GL 1
 %if %{with glvnd}
-Requires:	libglvnd-GL
+Requires:	libglvnd-GL%{?_isa}
 %endif
 %define oldglname %mklibname gl 1
 %rename %oldglname
@@ -510,7 +507,7 @@ Group:		System/Libraries
 Obsoletes:	%{_lib}mesaegl1 < 8.0
 Provides:	mesa-libEGL%{?_isa} = %{EVRD}
 %if %{with glvnd}
-Requires:	libglvnd-egl
+Requires:	libglvnd-egl%{?_isa}
 %endif
 %define oldegl %mklibname egl 1
 %rename %oldegl
@@ -599,7 +596,7 @@ Summary:	Development files for glesv1 libs
 Group:		Development/C
 Requires:	%{libglesv1}
 %if %{with glvnd}
-Requires:	libglvnd-GLESv1_CM
+Requires:	libglvnd-GLESv1_CM%{?_isa}
 # For libGLESv1_CM.so symlink
 Requires:	pkgconfig(libglvnd)
 %endif
@@ -629,7 +626,7 @@ Summary:	Development files for glesv2 libs
 Group:		Development/C
 Requires:	%{libglesv2}
 %if %{with glvnd}
-Requires:	libglvnd-GLESv2
+Requires:	libglvnd-GLESv2%{?_isa}
 %endif
 Obsoletes:	%{_lib}mesaglesv2_2-devel < 8.0
 Obsoletes:	%{_lib}glesv2_2-devel < %{version}-%{release}