commit f681be48171b9991d3fc787fbd1cbbc13adcad14 Author: Antonio Trande <sagitter(a)fedoraproject.org&gt; Date: Tue Oct 3 18:58:44 2023 +0200 Release 1.16.5 .gitignore | 1 + ppsspp-makesrc.sh | 24 ++++++++++++++++++++++++ ppsspp.spec | 50 +++++++++++++++++++------------------------------- sources | 2 +- 4 files changed, 45 insertions(+), 32 deletions(-) --- diff --git a/.gitignore b/.gitignore index b750390..0d7dd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ppsspp-ffmpeg-1.15.4.tar.gz /ppsspp-ffmpeg-1.16.3.tar.gz /ppsspp-ffmpeg-1.16.4.tar.gz +/ppsspp-ffmpeg-1.16.5.tar.gz diff --git a/ppsspp-makesrc.sh b/ppsspp-makesrc.sh new file mode 100755 index 0000000..4dbb855 --- /dev/null +++ b/ppsspp-makesrc.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +VERSION=1.16.5 +URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/ + +for u in $URL; do + mkdir -p ppsspp && pushd ppsspp + git clone -b v$VERSION --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git + cd ppsspp/ffmpeg + rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu + cd .. + rm -rf ios Windows* windows* macosx blackberry* symbian* + rm -rf dx9sdk pspautotests MoltenVK + cd .. +# find ppsspp -type d \( -name "ffmpeg" \) -exec rm -rf {} ';' + find ppsspp/android -perm /644 -type f \( -name "*.a" \) -exec rm -f {} ';' + find ppsspp -type d \( -name ".git*" \) -exec rm -rf {} ';' + find ppsspp -type f \( -name ".gitignore" \) -exec rm -rf {} ';' + find ppsspp -type f \( -name "*.a" \) -exec rm -rf {} ';' + popd + tar -czvf ppsspp-ffmpeg-$VERSION.tar.gz ppsspp + rm -rf ppsspp +done +exit 0 diff --git a/ppsspp.spec b/ppsspp.spec index 6c14b17..af53b34 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -75,42 +75,27 @@ ExcludeArch: %{power64} Name: ppsspp -Version: 1.16.4 +Version: 1.16.5 Release: 1%{?dist} Summary: A PSP emulator License: BSD and GPLv2+ URL: https://www.ppsspp.org/ -## This commit coincides with the commit of release %%{version}. -## We need to checkout it, then download relative submodules -## which are not included in the source code: -## -# git clone -b v1.16.3 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git -# cd ppsspp/ffmpeg -# rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu -# cd .. -# rm -rf ios Windows* windows* macosx blackberry* symbian* -# rm -rf dx9sdk pspautotests MoltenVK -# cd .. -# (if not used) find ppsspp -type d \( -name "ffmpeg" \) -exec rm -rf {} ';' -# find ppsspp/android -perm /644 -type f \( -name "*.a" \) -exec rm -f {} ';' -# find ppsspp -type d \( -name ".git*" \) -exec rm -rf {} ';' -# find ppsspp -type f \( -name ".gitignore" \) -exec rm -rf {} ';' -# find ppsspp -type f \( -name "*.a" \) -exec rm -rf {} ';' -# tar -czvf ppsspp-ffmpeg-%%{version}.tar.gz ppsspp -## +# Source code archive is made by executing this Bash script +Source0: %{name}-makesrc.sh + %if %{with ffmpeg} -Source0: %{name}-ffmpeg-%{version}.tar.gz +Source1: %{name}-ffmpeg-%{version}.tar.gz %else -Source0: %{name}-%{version}.tar.gz +Source2: %{name}-%{version}.tar.gz %endif -Source1: %{name}.desktop -Source2: %{name}.appdata.xml -Source3: %{name}-qt.desktop -Source4: %{name}-qt.appdata.xml +Source3: %{name}.desktop +Source4: %{name}.appdata.xml +Source5: %{name}-qt.desktop +Source6: %{name}-qt.appdata.xml # See https://github.com/hrydgard/ppsspp/issues/13119 -Source5: %{name}-qt-wayland.desktop +Source7: %{name}-qt-wayland.desktop # Fix version Patch0: %{name}-1.1.0-git-version.patch @@ -197,7 +182,7 @@ PPSSPP with Qt5 frontend wrapper. %endif %prep -%autosetup -n %{name} -N +%setup -qT -b 1 -n %{name} %patch -P 0 -p1 -b .backup @@ -325,8 +310,8 @@ export CFLAGS="%{build_cflags} -fPIC -lEGL -lGLESv2" mkdir -p %{buildroot}%{_bindir} %if %{with qt} install -pm 755 build2/PPSSPPQt %{buildroot}%{_bindir}/ -desktop-file-install -m 644 %SOURCE3 --dir=%{buildroot}%{_datadir}/applications desktop-file-install -m 644 %SOURCE5 --dir=%{buildroot}%{_datadir}/applications +desktop-file-install -m 644 %SOURCE7 --dir=%{buildroot}%{_datadir}/applications %endif install -pm 755 build/PPSSPPSDL %{buildroot}%{_bindir}/ @@ -373,7 +358,7 @@ install -pm 644 icons/icon-114.png %{buildroot}%{_datadir}/icons/%{name}/%{name} # Install desktop file mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install -m 644 %SOURCE1 --dir=%{buildroot}%{_datadir}/applications +desktop-file-install -m 644 %SOURCE3 --dir=%{buildroot}%{_datadir}/applications # Already installed @@ -381,9 +366,9 @@ rm -f %{buildroot}%{_datadir}/applications/PPSSPPSDL.desktop # Install appdata file mkdir -p %{buildroot}%{_metainfodir} -install -pm 644 %SOURCE2 %{buildroot}%{_metainfodir}/ -%if %{with qt} install -pm 644 %SOURCE4 %{buildroot}%{_metainfodir}/ +%if %{with qt} +install -pm 644 %SOURCE6 %{buildroot}%{_metainfodir}/ %endif appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml @@ -436,6 +421,9 @@ fi %{_datadir}/icons/%{name}/ %changelog +* Tue Oct 03 2023 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.16.5-1 +- Release 1.16.5 + * Wed Sep 27 2023 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.16.4-1 - Release 1.16.4 diff --git a/sources b/sources index dc83093..6981170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ppsspp-ffmpeg-1.16.4.tar.gz) = 3bf165ae21cb17308121044f392c8f50bdaa4b66ba3fe0351669ab5547c681c82877b840ec15e50c09aa72ed3f2f7b8108d17c275e408e283a77b458202b83e0 +SHA512 (ppsspp-ffmpeg-1.16.5.tar.gz) = eabaaa9a966a009ea2998123cfb21fe320623a44ea7dbdbe9b962cd49b787be8c4f75f4b7716f9b16ce5f587beae8305d7db774f7b1611a2040ae1a9b4df2450