diff --git a/srcpkgs/ppsspp/patches/rapidjson.patch b/srcpkgs/ppsspp/patches/rapidjson.patch new file mode 100644 index 00000000000..5e99e19deea --- /dev/null +++ b/srcpkgs/ppsspp/patches/rapidjson.patch @@ -0,0 +1,11 @@ +--- a/Core/RetroAchievements.cpp 2023-10-12 12:23:28.000000000 +0200 ++++ - 2023-10-13 14:36:02.617389722 +0200 +@@ -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 "Common/Log.h" + #include "Common/File/Path.h" diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 86511ef515d..2c0ded496eb 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,6 +1,6 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.15.4 +version=1.16.6 revision=1 _glslang_commit=b34f619e1c85810dcb3c578107d2e48ba4ee2b37 _SPIRV_Cross_commit=4212eef67ed0ca048cb726a6767185504e7695e5 @@ -8,6 +8,7 @@ _armips_commit=7bd1ec93d4586985ba1ef420b43b5e620f68695e _discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33 _miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e _cpu_features_commit=75ec988188f62281efe7bf1d133338751369bb4c +_rcheevos_commit=24dc84ca2dfbdbddebc9a26f4df225888e56a4f4 create_wrksrc=yes build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON @@ -16,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-devel) $(vopt_if wayland wayland-devel) + $(vopt_if sdl2 'SDL2_ttf-devel SDL2-devel') $(vopt_if wayland wayland-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" depends="desktop-file-utils" short_desc="Fast and portable PSP emulator" @@ -30,14 +31,16 @@ distfiles=" https://github.com/Kingcom/armips/archive/${_armips_commit}.tar.gz 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" -checksum="863c1343967061f623154b4afa0b0847898287af87c62ae6d223aeeb2c0885de + https://github.com/google/cpu_features/archive/${_cpu_features_commit}.tar.gz + https://github.com/RetroAchievements/rcheevos/archive/${_rcheevos_commit}.tar.gz" +checksum="d00de34506e030abae697ca19bc9d72ad5a9b34ee8292f008910944fb9a0fe37 9be7a69f5e5e2b9db55feb6d36d4b78bfe7a0cfb02e5915ff9bad87d719b38f8 a7adf77b5680795302aee160309c6cb81b0da341d92bd7face01f9a156b65aeb ed69c3e6362ae5b33b1e35efa16db48028b29e5b3b119f5ff046db25c05e8d1a 8f4115999391f95f443615fc5b13cb2398926ac4c418d3d34ff5735f71c6faea 1b1d2897f66835ea5eeec5851fe8757aca5afd86984107dcdc0e4b1ce2f2f8be - 9a7b247873621d6191f56e6d1a4ac8711dbbd26c6cba98edfc0863a2730dd05d" + 9a7b247873621d6191f56e6d1a4ac8711dbbd26c6cba98edfc0863a2730dd05d + 2d2dbcfd475d8bd719a9a7b1f2f4c763a169c426c8e5e6d50029cb98452fc360" # ppsspp always tries to compile x86 unittest # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d @@ -65,7 +68,8 @@ post_extract() { 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 } post_patch(){ @@ -73,6 +77,13 @@ post_patch(){ vsed -e 's|find_package(Git)|# &|' -i git-version.cmake } +post_configure() { + cat > "${wrksrc}/build/git-version.cpp" <<-EOF + const char *PPSSPP_GIT_VERSION = "${version}_${revision}-void"; + #define PPSSPP_GIT_VERSION_NO_UPDATE 1 + EOF +} + do_install() { vlicense LICENSE.TXT vinstall icons/icon.svg 644 usr/share/pixmaps ppsspp.svg