diff --git a/srcpkgs/ppsspp/patches/unittest.patch b/srcpkgs/ppsspp/patches/unittest.patch new file mode 100644 index 0000000000..e97e9efb10 --- /dev/null +++ b/srcpkgs/ppsspp/patches/unittest.patch @@ -0,0 +1,20 @@ +--- unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +0100 ++++ - 2021-03-09 23:30:50.634618762 +0100 +@@ -15,6 +15,7 @@ + // Official git repository and contact information can be found at + // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + ++#include + #include "Common/Common.h" + #include "Common/TimeUtil.h" + #include "Core/Config.h" +--- CMakeLists.txt 2021-03-02 21:50:51.000000000 +0100 ++++ - 2021-03-09 23:37:13.803584455 +0100 +@@ -2100,6 +2100,7 @@ + + if(UNITTEST) + add_executable(unitTest ++ unittest/TestShaderGenerators.cpp + unittest/UnitTest.cpp + unittest/TestArmEmitter.cpp + unittest/TestArm64Emitter.cpp diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index dc9f0913aa..eaf14bc7cf 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,20 +1,19 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.10.3 -revision=2 -lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209 -glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c -SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13 -armips_commit=7885552b208493a6a0f21663770c446c3ba65576 -discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a -create_wrksrc=yes -build_wrksrc="ppsspp-${version}" +version=1.11.3 +revision=1 +_lang_commit=6bd5b4bc983917ea8402f73c726b46e36f3de0b4 +_glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c +_SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13 +_armips_commit=7885552b208493a6a0f21663770c446c3ba65576 +_discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a +_miniupnp_commit=7e229ddd635933239583ab190d9b614bde018157 build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON -DUSING_QT_UI=$(vopt_if qt ON OFF)" hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)" makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel - snappy-devel rapidjson + snappy-devel rapidjson libpng-devel $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" depends="desktop-file-utils" @@ -24,17 +23,19 @@ license="GPL-2.0-or-later" homepage="https://www.ppsspp.org/" distfiles=" https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz - https://github.com/hrydgard/ppsspp-lang/archive/${lang_commit}.tar.gz - https://github.com/hrydgard/glslang/archive/${glslang_commit}.tar.gz - https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_Cross_commit}.tar.gz - https://github.com/Kingcom/armips/archive/${armips_commit}.tar.gz - https://github.com/discordapp/discord-rpc/archive/${discord_rpc_commit}.tar.gz" -checksum="92a0931c0817529202679f926632510658f3aeea83e2a1663f9cce595b505421 - 2e8a96867471a1e169176e561b06670d5aa460d49a2b074d84ae6378e91f6ef9 + https://github.com/hrydgard/ppsspp-lang/archive/${_lang_commit}.tar.gz + https://github.com/hrydgard/glslang/archive/${_glslang_commit}.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/${_SPIRV_Cross_commit}.tar.gz + 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" +checksum="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516 + b6e9fe4a7daa2dd8d4f3cc74cbafc5382f7df90303af3a3c18d25ec4492d8899 699e177e0022f17c204e3542bbf7fcb6843923095968edc1ebbc5124e85a2bdf 456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26 f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d - 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e" + 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e + 6819f0984fa647f69a74831a2333859a07099f64098ce58c35d8604d19532d3d" # ppsspp always tries to compile x86 unittest # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d @@ -48,17 +49,24 @@ esac build_options="wayland qt sdl2" build_options_default="sdl2" -pre_configure() { - # copy submodules to right location - cp -rup ${wrksrc}/ppsspp-lang-*/* ${wrksrc}/${pkgname}-${version}/assets/lang - cp -rup ${wrksrc}/armips-*/* ${wrksrc}/${pkgname}-${version}/ext/armips - cp -rup ${wrksrc}/glslang-*/* ${wrksrc}/${pkgname}-${version}/ext/glslang - cp -rup ${wrksrc}/SPIRV-Cross-*/* ${wrksrc}/${pkgname}-${version}/ext/SPIRV-Cross - cp -rup ${wrksrc}/discord-rpc-*/* ${wrksrc}/${pkgname}-${version}/ext/discord-rpc +post_extract() { + rmdir -v ${wrksrc}/assets/lang + mv ${wrksrc}/../ppsspp-lang-${_lang_commit} ${wrksrc}/assets/lang + 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 +} +post_patch(){ # disable git versioning - sed 's|find_package(Git)|# &|' -i ${wrksrc}/${pkgname}-${version}/git-version.cmake - rm -rf ${pkgname}-${version}/build + vsed -e 's|find_package(Git)|# &|' -i git-version.cmake } do_install() {