commit c9f4609cd218a288ff535fc7424bb7f74029c5e2 Author: Antonio Trande <sagitter(a)fedoraproject.org&gt; Date: Fri Oct 8 19:53:49 2021 +0200 Release 1.12 .gitignore | 1 + ppsspp-upstream_bug_14176.patch | 733 ---------------------------------------- ppsspp.spec | 20 +- sources | 2 +- 4 files changed, 13 insertions(+), 743 deletions(-) --- diff --git a/.gitignore b/.gitignore index 68b4e39..f917155 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ppsspp-ffmpeg-1.10.3.tar.gz /ppsspp-ffmpeg-1.11.tar.gz /ppsspp-ffmpeg-1.11.3.tar.gz +/ppsspp-1.12.tar.gz diff --git a/ppsspp.spec b/ppsspp.spec index d7169fa..30c5bf8 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -73,8 +73,8 @@ ExcludeArch: %{power64} Name: ppsspp -Version: 1.11.3 -Release: 2%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: A PSP emulator License: BSD and GPLv2+ URL: https://www.ppsspp.org/ @@ -96,7 +96,11 @@ URL: https://www.ppsspp.org/ # find ppsspp -type f \( -name "*.a" \) -exec rm -rf {} ';' # tar -czvf ppsspp-ffmpeg-%%{version}.tar.gz ppsspp ## +%if %{with ffmpeg} Source0: %{name}-ffmpeg-%{version}.tar.gz +%else +Source0: %{name}-%{version}.tar.gz +%endif Source1: %{name}.desktop Source2: %{name}.appdata.xml Source3: %{name}-qt.desktop @@ -113,10 +117,6 @@ Patch2: %{name}-ffmpeg-set_x64_build_flags.patch Patch3: %{name}-ffmpeg-set_aarch64_build_flags.patch Patch4: %{name}-ffmpeg-set_arm_build_flags.patch -# Remove deprecated API calls for new FFmpeg 4.3.x -# This patch permits FFMpeg unbundling -Patch5: %{name}-upstream_bug_14176.patch - BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(opengl) @@ -196,12 +196,11 @@ PPSSPP with Qt5 frontend wrapper. %patch0 -p1 -b .backup %patch1 -p1 -b .backup + +%if %{with ffmpeg} %patch2 -p1 -b .backup %patch3 -p1 -b .backup %patch4 -p1 -b .backup - -%if %{without ffmpeg} -%patch5 -p1 -b .backup %endif # Remove bundled libraries @@ -420,6 +419,9 @@ fi %{_datadir}/icons/%{name}/ %changelog +* Fri Oct 08 2021 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.12-1 +- Release 1.12 + * Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 7b2f413..e3c8dd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ppsspp-ffmpeg-1.11.3.tar.gz) = 75a68e1f60f105e5aaff7b8b070a77ba4b60c723179ccda292a4b11f7f0908d71c6685c720cf766c7ceeb489fcf088a9321619a78a798c9e4ce75f16d888de35 +SHA512 (ppsspp-1.12.tar.gz) = 279af3370d6891021727a7ec9ff2e639550f7c2ac6aa0c261b2a00cfb4805f5dd1a2c7b3fdbd8552148495d9bb47ba7e56a829a2c0ccc4aa1ca862eddddbcd34