Accepting request 1097003 from Emulators

ppsspp 1.15.4

OBS-URL: https://build.opensuse.org/request/show/1097003
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ppsspp?expand=0&rev=20
This commit is contained in:
Fabian Vogt 2023-07-06 16:28:56 +00:00 committed by Git OBS Bridge
commit b3629b20c1
6 changed files with 27 additions and 91 deletions

View File

@ -1,76 +0,0 @@
From 822592c6b1441f7110e1cb15dcc5cd2ea1de8099 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Wed, 5 Apr 2023 00:20:14 +0200
Subject: [PATCH] Fix build with GCC13: various standard includes
https://github.com/hrydgard/ppsspp/pull/17234
https://github.com/hrydgard/ppsspp/commit/9874737087e8d24ea72b3f08b4975031b54a80a5
---
Common/Data/Format/IniFile.h | 1 +
Common/GPU/OpenGL/GLFeatures.h | 1 +
Common/Net/NetBuffer.h | 2 ++
Core/Reporting.h | 1 +
ext/vma/vk_mem_alloc.h | 1 +
5 files changed, 6 insertions(+)
diff --git a/Common/Data/Format/IniFile.h b/Common/Data/Format/IniFile.h
index 1008fff5df94..cbe73f185542 100644
--- a/Common/Data/Format/IniFile.h
+++ b/Common/Data/Format/IniFile.h
@@ -8,6 +8,7 @@
#include <map>
#include <string>
#include <vector>
+#include <cstdint>
#include "Common/File/Path.h"
diff --git a/Common/GPU/OpenGL/GLFeatures.h b/Common/GPU/OpenGL/GLFeatures.h
index 04df20f87f5a..f2aa3380568d 100644
--- a/Common/GPU/OpenGL/GLFeatures.h
+++ b/Common/GPU/OpenGL/GLFeatures.h
@@ -5,6 +5,7 @@
#pragma once
#include <string>
+#include <cstdint>
// TODO: Replace with thin3d's vendor enum.
enum {
diff --git a/Common/Net/NetBuffer.h b/Common/Net/NetBuffer.h
index 6247aca98555..12a4ba37c8c4 100644
--- a/Common/Net/NetBuffer.h
+++ b/Common/Net/NetBuffer.h
@@ -1,5 +1,7 @@
#pragma once
+#include <cstdint>
+
#include "Common/Buffer.h"
namespace net {
diff --git a/Core/Reporting.h b/Core/Reporting.h
index 211267c8f77c..1d254256f75a 100644
--- a/Core/Reporting.h
+++ b/Core/Reporting.h
@@ -19,6 +19,7 @@
#include <string>
#include <vector>
+#include <cstdint>
#include "Common/CommonTypes.h"
#include "Common/File/Path.h"
diff --git a/ext/vma/vk_mem_alloc.h b/ext/vma/vk_mem_alloc.h
index f52dceeaf416..90719c161516 100644
--- a/ext/vma/vk_mem_alloc.h
+++ b/ext/vma/vk_mem_alloc.h
@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#include <cstring>
#include <utility>
#include <type_traits>
+#include <cstdio>
#ifdef _MSC_VER
#include <intrin.h> // For functions like __popcnt, _BitScanForward etc.

View File

@ -12,11 +12,11 @@ sed -i \
-e 's|^#include [\"<]libpng1[0-9]/png.h[\">]|#include <png.h>|g' \
{} \;
Index: ppsspp-1.14.4/CMakeLists.txt
Index: ppsspp-1.15.4/CMakeLists.txt
===================================================================
--- ppsspp-1.14.4.orig/CMakeLists.txt
+++ ppsspp-1.14.4/CMakeLists.txt
@@ -319,7 +319,7 @@ foreach (LANGUAGE C CXX)
--- ppsspp-1.15.4.orig/CMakeLists.txt
+++ ppsspp-1.15.4/CMakeLists.txt
@@ -326,7 +326,7 @@ foreach (LANGUAGE C CXX)
endforeach()
if(NOT MSVC)
@ -25,7 +25,7 @@ Index: ppsspp-1.14.4/CMakeLists.txt
add_definitions(-DPNG_ARM_NEON_OPT=0)
if(ANDROID)
@@ -1036,7 +1036,7 @@ else()
@@ -1069,7 +1069,7 @@ else()
set(LIBZIP_LIBRARY libzip)
endif()
@ -34,7 +34,7 @@ Index: ppsspp-1.14.4/CMakeLists.txt
if(ANDROID OR ARMV7 OR ARM64 OR ARM OR IOS)
set(PNG_REQUIRED_VERSION 1.7)
else()
@@ -1051,43 +1051,43 @@ if(PNG_FOUND)
@@ -1084,43 +1084,43 @@ if(PNG_FOUND)
else()
if(ARM)
set(PNG_ARM_INCLUDES
@ -107,11 +107,11 @@ Index: ppsspp-1.14.4/CMakeLists.txt
+ include_directories(ext/libpng16)
endif()
set(nativeExtra)
Index: ppsspp-1.14.4/ext/native/tools/atlastool.cpp
add_library(basis_universal STATIC
Index: ppsspp-1.15.4/ext/native/tools/atlastool.cpp
===================================================================
--- ppsspp-1.14.4.orig/ext/native/tools/atlastool.cpp
+++ ppsspp-1.14.4/ext/native/tools/atlastool.cpp
--- ppsspp-1.15.4.orig/ext/native/tools/atlastool.cpp
+++ ppsspp-1.15.4/ext/native/tools/atlastool.cpp
@@ -19,7 +19,7 @@
// dist-per-pixel

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54ede41af569116d9c284f7b157d1449dcd13944675e60c2875bf3a3994f5dda
size 46405556

3
ppsspp-1.15.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a20bd27b4cda811d6cd2182fbfcd16f7092d6a5d07fcbbd00cc7230530bdf68c
size 51947468

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jul 5 19:50:58 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>
- ppsspp 1.15.4
* Fixes to tilt controls, performance improvements, various crash
or lock issues, problems with some controllers, textures
* Fixes for games DJ Max, WWE 2009, Rockman 2 (audio)
* Stutter caused by shader compilation has been reduced drastically
* Texture replacement improvements
* VR features: Top down camera, Head rotation control, more
stereo support
- drop ppsspp-1.14.4-gcc13.patch now upstream
-------------------------------------------------------------------
Tue Apr 4 20:44:11 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -18,7 +18,7 @@
%define _lto_cflags %{nil}
Name: ppsspp
Version: 1.14.4
Version: 1.15.4
Release: 0
Summary: PlayStation Portable Emulator
License: GPL-2.0-or-later
@ -26,7 +26,6 @@ Group: System/Emulators/Other
URL: https://www.ppsspp.org
Source: https://github.com/hrydgard/ppsspp/releases/download/v%{version}/%{name}-%{version}.tar.xz
Patch0: ppsspp-1.14.4-system-png.patch
Patch1: ppsspp-1.14.4-gcc13.patch
BuildRequires: Mesa-devel
BuildRequires: cmake >= 3.6
BuildRequires: fdupes