commit e413312e5e099958162012fb25febe16f283a2c6 Author: Antonio Trande <sagitter(a)fedoraproject.org&gt; Date: Sat Sep 24 18:41:31 2022 +0200 Release 1.13.2 .gitignore | 1 + ppsspp-use-qt6.patch | 31 +++++++++++++++++++++++++++++++ ppsspp.spec | 15 ++++++++++----- sources | 2 +- 4 files changed, 43 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index b9cd2a2..7de0c8c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /ppsspp-ffmpeg-1.12.3.tar.gz /ppsspp-ffmpeg-1.13.tar.gz /ppsspp-ffmpeg-1.13.1.tar.gz +/ppsspp-ffmpeg-1.13.2.tar.gz diff --git a/ppsspp-use-qt6.patch b/ppsspp-use-qt6.patch new file mode 100644 index 0000000..15fe05f --- /dev/null +++ b/ppsspp-use-qt6.patch @@ -0,0 +1,31 @@ +--- a/CMakeLists.orig.txt 2022-08-20 19:23:21.899167000 +0200 ++++ b/CMakeLists.txt 2022-08-20 19:25:18.521420643 +0200 +@@ -1102,7 +1102,7 @@ + set(TargetBin PPSSPP) + elseif(USING_QT_UI) + set(CMAKE_AUTOMOC ON) +- find_package(Qt5 COMPONENTS OpenGL Gui Core Multimedia) ++ find_package(Qt6 COMPONENTS OpenGL Gui Core Multimedia) + list(APPEND NativeAppSource + Qt/QtMain.cpp + Qt/QtMain.h +@@ -1118,7 +1118,7 @@ + + include_directories(Qt) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) +- set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core Qt5::Multimedia) ++ set(nativeExtraLibs ${nativeExtraLibs} Qt6::OpenGL Qt6::Gui Qt6::Core Qt6::Multimedia) + set(TargetBin PPSSPPQt) + + # Enable SDL joystick if SDL is found +--- a/Common/Render/Text/draw_text_qt.orig.cpp 2022-08-09 19:30:10.000000000 +0200 ++++ b/Common/Render/Text/draw_text_qt.cpp 2022-08-20 20:01:54.828779935 +0200 +@@ -14,7 +14,7 @@ + #include <QtGui/QImage> + #include <QtGui/QPainter> + #include <QtGui/QFontMetrics> +-#include <QtOpenGL/QGLWidget> ++#include <QtOpenGLWidgets/QOpenGLWidget> + + TextDrawerQt::TextDrawerQt(Draw::DrawContext *draw) : TextDrawer(draw) { + } diff --git a/ppsspp.spec b/ppsspp.spec index 67e4615..53d226f 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -73,8 +73,8 @@ ExcludeArch: %{power64} Name: ppsspp -Version: 1.13.1 -Release: 2%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: A PSP emulator License: BSD and GPLv2+ URL: https://www.ppsspp.org/ @@ -116,6 +116,7 @@ Patch2: %{name}-ffmpeg-set_x64_build_flags.patch Patch3: %{name}-ffmpeg-set_aarch64_build_flags.patch Patch4: %{name}-ffmpeg-set_arm_build_flags.patch Patch5: %{name}-fix_compile_issue.patch +Patch6: %{name}-use-qt6.patch BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) @@ -142,9 +143,9 @@ BuildRequires: gcc gcc-c++ BuildRequires: libzip-devel BuildRequires: snappy-devel BuildRequires: zlib-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtmultimedia-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qttools-devel +BuildRequires: qt6-qtmultimedia-devel BuildRequires: libappstream-glib BuildRequires: rapidjson-devel @@ -202,6 +203,7 @@ PPSSPP with Qt5 frontend wrapper. %patch4 -p1 -b .backup %patch5 -p1 -b .backup %endif +%patch6 -p1 -b .qt6_backup # Remove bundled libraries rm -rf /ext/native/ext/libzip @@ -421,6 +423,9 @@ fi %{_datadir}/icons/%{name}/ %changelog +* Sat Sep 24 2022 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.13.2-1 +- Release 1.13.2 + * Sat Aug 20 2022 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.13.1-2 - Fix QT_QPA_PLATFORM env variables diff --git a/sources b/sources index 2516fe1..1f7b1c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ppsspp-ffmpeg-1.13.1.tar.gz) = 9826393f801590d73712c24bde859190f50d6b3b9dea261aadbe2c88c78db7ff57ab774c4ef692bd2ba38ca2e10141afc983eb8def6460d865b59a874aa1e5a7 +SHA512 (ppsspp-ffmpeg-1.13.2.tar.gz) = f850e392dad7c121635ae85b0f83d7252df4fc5a499dd5177bab7385fbde940ad4c971ce0d4e2c8035a3124623f4f5ebd929ac546a01f16cf8cc8c38ff4fd731