From 1a0b53509ffc74359289c3c27e548539c99b7ffe Mon Sep 17 00:00:00 2001 From: John Date: Sun, 11 Feb 2024 23:54:33 +0100 Subject: [PATCH] ppsspp: update to 1.17.1. --- srcpkgs/ppsspp/patches/rapidjson.patch | 6 +-- srcpkgs/ppsspp/template | 62 ++++++++++++++------------ 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/srcpkgs/ppsspp/patches/rapidjson.patch b/srcpkgs/ppsspp/patches/rapidjson.patch index 5e99e19deeafa..6585c2661522b 100644 --- a/srcpkgs/ppsspp/patches/rapidjson.patch +++ b/srcpkgs/ppsspp/patches/rapidjson.patch @@ -1,11 +1,11 @@ ---- a/Core/RetroAchievements.cpp 2023-10-12 12:23:28.000000000 +0200 -+++ - 2023-10-13 14:36:02.617389722 +0200 +--- ppsspp-1.17.1/Core/RetroAchievements.cpp 2024-02-04 14:08:02.000000000 +0100 ++++ - 2024-02-12 00:07:54.268096492 +0100 @@ -26,7 +26,7 @@ #include "ext/rcheevos/include/rc_hash.h" #include "ext/rcheevos/src/rhash/md5.h" -#include "ext/rapidjson/include/rapidjson/document.h" -+#include "rapidjson/document.h" ++#include #include "Common/Log.h" #include "Common/File/Path.h" diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 2c0ded496eb98..2238a7601c0af 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,15 +1,15 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.16.6 +version=1.17.1 revision=1 _glslang_commit=b34f619e1c85810dcb3c578107d2e48ba4ee2b37 _SPIRV_Cross_commit=4212eef67ed0ca048cb726a6767185504e7695e5 -_armips_commit=7bd1ec93d4586985ba1ef420b43b5e620f68695e +_armips_commit=a8d71f0f279eb0d30ecf6af51473b66ae0cf8e8d _discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33 _miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e -_cpu_features_commit=75ec988188f62281efe7bf1d133338751369bb4c -_rcheevos_commit=24dc84ca2dfbdbddebc9a26f4df225888e56a4f4 -create_wrksrc=yes +_cpu_features_commit=fd4ffc1632db7b4e763bd28ffa6fc9d761cf3587 +_rcheevos_commit=e7989c300280ba06d7621ae5b4e00ac7fe28d97a +_libchdr_commit=26d27ca4903aaccd3ef41337b29bf5ecafb1f0ca build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON -DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=ON @@ -17,7 +17,7 @@ configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)" makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel snappy-devel rapidjson libpng-devel libzstd-devel - $(vopt_if sdl2 'SDL2_ttf-devel SDL2-devel') $(vopt_if wayland wayland-devel) + $(vopt_if sdl2 'SDL2_ttf-devel SDL2-devel') wayland-devel $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" depends="desktop-file-utils" short_desc="Fast and portable PSP emulator" @@ -32,15 +32,28 @@ distfiles=" https://github.com/discordapp/discord-rpc/archive/${_discord_rpc_commit}.tar.gz https://github.com/hrydgard/miniupnp/archive/${_miniupnp_commit}.tar.gz https://github.com/google/cpu_features/archive/${_cpu_features_commit}.tar.gz - https://github.com/RetroAchievements/rcheevos/archive/${_rcheevos_commit}.tar.gz" -checksum="d00de34506e030abae697ca19bc9d72ad5a9b34ee8292f008910944fb9a0fe37 + https://github.com/RetroAchievements/rcheevos/archive/${_rcheevos_commit}.tar.gz + https://github.com/rtissera/libchdr/archive/${_libchdr_commit}.tar.gz" +checksum="dd65e7a317cd461386a1641ddf475686d8bdb2f408bdae910386d8b3ca6a8195 9be7a69f5e5e2b9db55feb6d36d4b78bfe7a0cfb02e5915ff9bad87d719b38f8 a7adf77b5680795302aee160309c6cb81b0da341d92bd7face01f9a156b65aeb - ed69c3e6362ae5b33b1e35efa16db48028b29e5b3b119f5ff046db25c05e8d1a + a520df5b673fc1649661f8506ddf35f62fb55e05d9f5a6c44b4d807b6aab3fbd 8f4115999391f95f443615fc5b13cb2398926ac4c418d3d34ff5735f71c6faea 1b1d2897f66835ea5eeec5851fe8757aca5afd86984107dcdc0e4b1ce2f2f8be - 9a7b247873621d6191f56e6d1a4ac8711dbbd26c6cba98edfc0863a2730dd05d - 2d2dbcfd475d8bd719a9a7b1f2f4c763a169c426c8e5e6d50029cb98452fc360" + 60b2e0e7adfbf40f0c69fb77ad197440a8435532285a83b19f99b4f886cca67a + fc184cc6fc17ca6645faef3b275fd6e18af76a04e0ee009a3a34bd2f58ffe485 + 006f323b6330c98883db887cbb7d2d13379498f34d5a2ee98850a1ff21a93d8a" + +skip_extraction=" + ${_armips_commit}.tar.gz + ${_glslang_commit}.tar.gz + ${_SPIRV_Cross_commit}.tar.gz + ${_discord_rpc_commit}.tar.gz + ${_miniupnp_commit}.tar.gz + ${_cpu_features_commit}.tar.gz + ${_rcheevos_commit}.tar.gz + ${_libchdr_commit}.tar.gz + " # ppsspp always tries to compile x86 unittest # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d @@ -51,28 +64,21 @@ case $XBPS_TARGET_MACHINE in *) configure_args+=" -DUNITTEST=OFF";; esac -build_options="wayland qt sdl2" +build_options="qt sdl2" build_options_default="sdl2" post_extract() { - mv ppsspp-${version}/* . - rmdir -v ${wrksrc}/ext/armips - mv ${wrksrc}/armips-${_armips_commit} ${wrksrc}/ext/armips - rmdir -v ${wrksrc}/ext/glslang - mv ${wrksrc}/glslang-${_glslang_commit} ${wrksrc}/ext/glslang - rmdir -v ${wrksrc}/ext/SPIRV-Cross - mv ${wrksrc}/SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross - rmdir -v ${wrksrc}/ext/discord-rpc - mv ${wrksrc}/discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc - rmdir -v ${wrksrc}/ext/miniupnp - mv ${wrksrc}/miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp - rmdir -v ${wrksrc}/ext/cpu_features - mv ${wrksrc}/cpu_features-${_cpu_features_commit} ${wrksrc}/ext/cpu_features - rmdir -v ${wrksrc}/ext/rcheevos - mv ${wrksrc}/rcheevos-${_rcheevos_commit} ${wrksrc}/ext/rcheevos + vsrcextract -C ext/armips ${_armips_commit}.tar.gz + vsrcextract -C ext/glslang ${_glslang_commit}.tar.gz + vsrcextract -C ext/SPIRV-Cross ${_SPIRV_Cross_commit}.tar.gz + vsrcextract -C ext/discord-rpc ${_discord_rpc_commit}.tar.gz + vsrcextract -C ext/miniupnp ${_miniupnp_commit}.tar.gz + vsrcextract -C ext/cpu_features ${_cpu_features_commit}.tar.gz + vsrcextract -C ext/rcheevos ${_rcheevos_commit}.tar.gz + vsrcextract -C ext/libchdr ${_libchdr_commit}.tar.gz } -post_patch(){ +post_patch() { # disable git versioning vsed -e 's|find_package(Git)|# &|' -i git-version.cmake }