9:16 a.m.
commit 69d4c1237b65c1b1ae7444dc5767b07ac66747bc
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Jun 28 11:16:35 2020 +0200
Release 1.10.0
.gitignore | 1 +
ppsspp-1.10.0-bug13058.patch | 41 ++++++++++++++++++++++++++++
ppsspp-1.10.0-remove_unrecognized_flag.patch | 10 +++++++
ppsspp-bug12593.patch | 37 -------------------------
ppsspp.desktop | 1 +
ppsspp.spec | 20 ++++++++------
sources | 2 +-
7 files changed, 66 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c6718b..724c0d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/ppsspp-1.8.0.tar.gz
/ppsspp-1.9.0.tar.gz
/ppsspp-1.9.4.tar.gz
+/ppsspp-1.10.0.tar.gz
diff --git a/ppsspp-1.10.0-bug13058.patch b/ppsspp-1.10.0-bug13058.patch
new file mode 100644
index 0000000..2e88daf
--- /dev/null
+++ b/ppsspp-1.10.0-bug13058.patch
@@ -0,0 +1,41 @@
+From cad7603ccdc612a444a950869f3583088b30df33 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich(a)FreeBSD.org>
+Date: Sat, 27 Jun 2020 18:43:17 +0000
+Subject: [PATCH] Qt: unbreak build without SDL
+
+Qt/QtMain.cpp:51:1: error: unknown type name 'SDL_AudioSpec'
+SDL_AudioSpec g_retFmt;
+^
+1 error generated.
+---
+ Qt/QtMain.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
+index 7713b6587d..7f9726b417 100644
+--- a/Qt/QtMain.cpp
++++ b/Qt/QtMain.cpp
+@@ -48,9 +48,9 @@ static int browseFileEvent = -1;
+ static int browseFolderEvent = -1;
+ QTCamera *qtcamera = nullptr;
+
++#ifdef SDL
+ SDL_AudioSpec g_retFmt;
+
+-#ifdef SDL
+ static SDL_AudioDeviceID audioDev = 0;
+
+ extern void mixaudio(void *userdata, Uint8 *stream, int len) {
+@@ -147,10 +147,12 @@ std::string System_GetProperty(SystemProperty prop) {
+
+ int System_GetPropertyInt(SystemProperty prop) {
+ switch (prop) {
++#if defined(SDL)
+ case SYSPROP_AUDIO_SAMPLE_RATE:
+ return g_retFmt.freq;
+ case SYSPROP_AUDIO_FRAMES_PER_BUFFER:
+ return g_retFmt.samples;
++#endif
+ case SYSPROP_DEVICE_TYPE:
+ #if defined(__ANDROID__)
+ return DEVICE_TYPE_MOBILE;
diff --git a/ppsspp-1.10.0-remove_unrecognized_flag.patch
b/ppsspp-1.10.0-remove_unrecognized_flag.patch
new file mode 100644
index 0000000..211cf4c
--- /dev/null
+++ b/ppsspp-1.10.0-remove_unrecognized_flag.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.orig.txt 2020-06-27 19:48:53.570256414 +0200
++++ b/CMakeLists.txt 2020-06-27 21:39:47.892536425 +0200
+@@ -272,7 +272,6 @@
+ # Disable some warnings
+ add_definitions(-Wno-multichar)
+ add_definitions(-Wno-deprecated-register)
+- add_definitions(-Wno-tautological-pointer-compare)
+
+ # Don't compile with strict aliasing, we're not 100% aliasing-safe
+ add_compile_options(-fno-strict-aliasing)
diff --git a/ppsspp.desktop b/ppsspp.desktop
index 73e2a7f..6f741b9 100644
--- a/ppsspp.desktop
+++ b/ppsspp.desktop
@@ -9,3 +9,4 @@ X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
Name[en_US]=ppsspp
+Categories=Game;Simulation;
diff --git a/ppsspp.spec b/ppsspp.spec
index dae6df4..4f1620e 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -4,9 +4,9 @@ ExcludeArch: %{power64}
# -Wl,--as-needed breaks linking on fedora 30+
%undefine _ld_as_needed
-%global commit e3c9793cb3a68ec9f44371c7ebb45a0abed1ecca
+%global commit 401df203844465b84015d4710c6f02914b890589
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20191016
+%global date 20200627
%bcond_with debug
@@ -19,8 +19,8 @@ ExcludeArch: %{power64}
%bcond_with egles2
Name: ppsspp
-Version: 1.9.4
-Release: 3%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
Summary: A PSP emulator
License: BSD and GPLv2+
URL: https://www.ppsspp.org/
@@ -46,10 +46,10 @@ Source1: %{name}.desktop
Source2: %{name}.appdata.xml
# Fix version
-Patch0: %{name}-1.1.0-git-version.patch
+Patch0: %{name}-1.1.0-git-version.patch
+Patch1: %{name}-1.10.0-remove_unrecognized_flag.patch
-# https://github.com/hrydgard/ppsspp/pull/12593
-Patch1: %{name}-bug12593.patch
+Patch2: %{name}-1.10.0-bug13058.patch
%if %{with egles2}
BuildRequires: mesa-libEGL-devel
@@ -71,6 +71,7 @@ BuildRequires: libGL-devel
%if %{with qt}
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qtmultimedia-devel
%endif
BuildRequires: libappstream-glib
BuildRequires: rapidjson-devel
@@ -136,7 +137,7 @@ export CFLAGS="-O0 -g -fPIC"
-DUSE_FFMPEG:BOOL=ON -DUSE_SYSTEM_FFMPEG:BOOL=ON \
-DUSE_SYSTEM_LIBZIP:BOOL=ON -DUSE_WAYLAND_WSI:BOOL=ON \
%if %{with egles2}
- -DUSING_EGL:BOOL=OFF -DUSING_GLES2:BOOL=OFF \
+ -DUSING_EGL:BOOL=ON -DUSING_GLES2:BOOL=ON \
-DOPENGL_EGL_INCLUDE_DIR:PATH="%{_includedir}/EGL -I%{_includedir}/GLES2" \
%endif
-DUSING_X11_VULKAN=ON \
@@ -241,6 +242,9 @@ fi
%changelog
+* Sat Jun 27 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 1.10.0-1
+- Release 1.10.0
+
* Wed Feb 19 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 1.9.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
- Patched for GCC-10
diff --git a/sources b/sources
index 1f3a6ef..e439f8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ppsspp-1.9.4.tar.gz) =
31e20e4739125b1d9894b1c63be53ed985fd3fc0b469945900d4be6f2c9dc6f79dc07ef4831fd7e46db0c9837ea48d75d1e591b9939dcddd20ebc2d9ad95af60
+SHA512 (ppsspp-1.10.0.tar.gz) =
01972a986491a4a00a56244ed7e43d217dc6d8aff03ec16c15c8894dcadae881d660b00fd436d727a31e7ef91985724f22ff1c55d5f294cd9e22ca149b2be86f