commit 7e648c195192f0a00185c0a60d65d77be563c13a Author: Antonio Trande <sagitter(a)fedoraproject.org&gt; Date: Thu Jul 28 14:53:12 2022 +0200 Release 1.13 including bundled FFMpeg-3.0.2 .gitignore | 1 + ppsspp-1.1.0-git-version.patch | 2 +- ppsspp-1.10.0-remove_unrecognized_flag.patch | 10 ---------- ppsspp.spec | 16 +++++++--------- sources | 2 +- 5 files changed, 10 insertions(+), 21 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9b40e91..f3f6102 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /ppsspp-1.12.2.tar.gz /ppsspp-1.12.3.tar.gz /ppsspp-ffmpeg-1.12.3.tar.gz +/ppsspp-ffmpeg-1.13.tar.gz diff --git a/ppsspp-1.1.0-git-version.patch b/ppsspp-1.1.0-git-version.patch index 3e9f2d7..0f9b268 100644 --- a/ppsspp-1.1.0-git-version.patch +++ b/ppsspp-1.1.0-git-version.patch @@ -2,7 +2,7 @@ diff -urN a/git-version.cmake b/git-version.cmake --- a/git-version.cmake 2015-10-05 02:52:23.000000000 +1000 +++ b/git-version.cmake 2015-10-05 23:23:47.691228897 +1000 @@ -1,30 +1,7 @@ - set(GIT_VERSION_FILE "${SOURCE_DIR}/git-version.cpp") + set(GIT_VERSION_FILE "${OUTPUT_DIR}/git-version.cpp") -set(GIT_VERSION "unknown") +set(GIT_VERSION "@@unknown_version@@") set(GIT_VERSION_UPDATE "1") diff --git a/ppsspp.spec b/ppsspp.spec index 743ee5e..7d17d54 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -73,8 +73,8 @@ ExcludeArch: %{power64} Name: ppsspp -Version: 1.12.3 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: A PSP emulator License: BSD and GPLv2+ URL: https://www.ppsspp.org/ @@ -83,7 +83,7 @@ URL: https://www.ppsspp.org/ ## We need to checkout it, then download relative submodules ## which are not included in the source code: ## -# git clone -b v1.12.3 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git +# git clone -b v1.13 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git # cd ppsspp/ffmpeg && git checkout ?70bfd4a77487e56ef60b4adfc47f714cfea59794 # rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu # cd .. @@ -112,8 +112,6 @@ Source5: %{name}-qt-wayland.desktop # Fix version Patch0: %{name}-1.1.0-git-version.patch -Patch1: %{name}-1.10.0-remove_unrecognized_flag.patch - Patch2: %{name}-ffmpeg-set_x64_build_flags.patch Patch3: %{name}-ffmpeg-set_aarch64_build_flags.patch Patch4: %{name}-ffmpeg-set_arm_build_flags.patch @@ -196,7 +194,6 @@ PPSSPP with Qt5 frontend wrapper. %autosetup -n %{name} -N %patch0 -p1 -b .backup -%patch1 -p1 -b .backup %if %{with ffmpeg} %patch2 -p1 -b .backup @@ -228,7 +225,7 @@ sed -e 's| -O2 | -O0 |g' -i CMakeLists.txt ext/SPIRV-Cross/Makefile Tools/pauth_ sed -e 's| -D_NDEBUG | -DDEBUG |g' -i CMakeLists.txt libretro/Makefile ext/SPIRV-Cross/Makefile sed -e 's| -DNDEBUG | -DDEBUG |g' -i ext/SPIRV-Cross/Makefile %else -sed -e 's| -O3 | -O2 |g' -i CMakeLists.txt ext/SPIRV-Cross/Makefile Tools/pauth_tool/Makefile ext/armips/ext/tinyformat/Makefile +sed -e 's| -O3 | -O2 |g' -i CMakeLists.txt ext/SPIRV-Cross/Makefile ext/armips/ext/tinyformat/Makefile %endif ## Remove spurious executable permissions @@ -352,8 +349,6 @@ patchelf --set-rpath %{_libdir}/%{name} %{buildroot}%{_libdir}/%{name}/*.so* mkdir -p %{buildroot}%{_datadir}/%{name} cp -a build2/assets %{buildroot}%{_datadir}/%{name}/ install -pm 644 Qt/languages/*.ts %{buildroot}%{_datadir}/%{name}/assets/lang/ -install -pm 644 korean.txt %{buildroot}%{_datadir}/%{name}/assets/lang/korean.ini -install -pm 644 chinese.txt %{buildroot}%{_datadir}/%{name}/assets/lang/chinese.ini # Remove unnecessary files rm -rf %{buildroot}%{_includedir} @@ -424,6 +419,9 @@ fi %{_datadir}/icons/%{name}/ %changelog +* Thu Jul 28 2022 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.13-1 +- Release 1.13 including bundled FFMpeg-3.0.2 + * Sun Feb 06 2022 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 1.12.3-2 - Source archive re-generated including bundled FFMpeg - Rebuild against bundled FFMpeg-3.0.2 (upstream bug #15308) diff --git a/sources b/sources index 5799f60..05ab414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ppsspp-ffmpeg-1.12.3.tar.gz) = a785ebfd56138ad1227604a8b77a46dde73dfe2d7396a49409393ee18c952365fbaa39cd6a6ec7a743364ee1d2cc132a93bb665fa0a5f63d225e488b409bd01b +SHA512 (ppsspp-ffmpeg-1.13.tar.gz) = d34e191fc29703fbabc9e1bf12a338989701da3b4a225dbb3bbcd83d6076c29c6fd44829120cc3da455bb27e58b5c4033c03be2ed11236fa7869f6fee264d067