[ppsspp] Patched for GCC-10

commit ec577ad7e93abfd0683c1a7989a8383ea5d96acf Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Wed Feb 19 22:36:00 2020 +0100 Patched for GCC-10 ppsspp-bug12593.patch | 37 +++++++++++++++++++++++++++++++++++++ ppsspp.spec | 8 ++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) --- diff --git a/ppsspp-bug12593.patch b/ppsspp-bug12593.patch new file mode 100644 index 0000000..e6b20a0 --- /dev/null +++ b/ppsspp-bug12593.patch @@ -0,0 +1,37 @@ +From 66ff2d8a4af06bb3e990d0838e44cca5c5944ba1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox(a)gentoo.org&gt; +Date: Sat, 25 Jan 2020 17:59:53 +0000 +Subject: [PATCH] Common/Hashmaps.h: add missing <stdint> include + +On gcc-10 the build fails as: + +``` +[ 51%] Building CXX object CMakeFiles/Core.dir/GPU/Null/NullGpu.cpp.o +In file included from ../GPU/Common/DrawEngineCommon.h:24, + from ../GPU/Null/NullGpu.cpp:18: +../Common/Hashmaps.h:11:7: error: 'uint32_t' does not name a type; did you mean 'u_int32_t'? + 11 | const uint32_t hashmapSeed = 0x23B58532; + | ^~~~~~~~ + | u_int32_t +``` + +This happens due to improved transitive include hygiene on +gcc-10 headers. The change includes <cstdint> to pull in +'uint32_t' typedef. + +Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org&gt; +--- + Common/Hashmaps.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Common/Hashmaps.h b/Common/Hashmaps.h +index f0a6fe4709..e5e36be02e 100644 +--- a/Common/Hashmaps.h ++++ b/Common/Hashmaps.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> /* uint32_t */ + #include <cstring> + #include <vector> + diff --git a/ppsspp.spec b/ppsspp.spec index 79eb9e4..cd8504b 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -20,7 +20,7 @@ ExcludeArch: %{power64} Name: ppsspp Version: 1.9.4 -Release: 3%{?dist} +Release: 2%{?dist} Summary: A PSP emulator License: BSD and GPLv2+ URL: https://www.ppsspp.org/ @@ -48,6 +48,9 @@ Source2: %{name}.appdata.xml # Fix version Patch0: %{name}-1.1.0-git-version.patch +# https://github.com/hrydgard/ppsspp/pull/12593 +Patch1: %{name}-bug12593.patch + %if %{with egles2} BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libGLES-devel @@ -238,8 +241,9 @@ fi %changelog -* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.9.4-3 +* Wed Feb 19 2020 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +- Patched for GCC-10 * Wed Nov 06 2019 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.9.4-2 - Unset EGL/GLES support