ppsspp: update to 1.12.3.

This commit is contained in:
John 2021-10-21 21:32:06 +02:00
parent 11b1a51151
commit 487e93188e
2 changed files with 55 additions and 17 deletions
srcpkgs/ppsspp

View file

@ -0,0 +1,43 @@
diff '--color=auto' -rupN libretro-ppsspp.orig/CMakeLists.txt libretro-ppsspp/CMakeLists.txt
--- libretro-ppsspp.orig/CMakeLists.txt 2021-10-01 17:28:30.046655852 +0200
+++ libretro-ppsspp/CMakeLists.txt 2021-10-01 17:30:38.698699237 +0200
@@ -151,6 +151,7 @@ option(USE_MINIUPNPC "Build with miniUPn
option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY})
option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP})
+option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD})
option(USE_SYSTEM_LIBSDL2 "Dynamically link against system SDL2" ON)
option(USE_SYSTEM_LIBPNG "Dynamically link against system libpng" ON)
option(USE_ASAN "Use address sanitizer" OFF)
@@ -1976,8 +1977,20 @@ if(ANDROID)
endif()
endif()
-set(CoreExtraLibs ${CoreExtraLibs} armips libzstd_static)
-include_directories(ext/zstd/lib)
+set(CoreExtraLibs ${CoreExtraLibs} armips)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(ZSTD libzstd)
+endif()
+if(ZSTD_FOUND AND USE_SYSTEM_ZSTD)
+ include_directories(${ZSTD_INCLUDE_DIRS})
+ target_link_libraries(${CoreLibName} ${ZSTD_LIBRARIES})
+else()
+ add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
+ include_directories(ext/zstd/lib)
+ set(CoreExtraLibs ${CoreExtraLibs} libzstd_static)
+endif()
# needed for VK_USE_PLATFORM_XCB_KHR only
#if(VULKAN AND NOT WIN32)
diff '--color=auto' -rupN libretro-ppsspp.orig/ext/CMakeLists.txt libretro-ppsspp/ext/CMakeLists.txt
--- libretro-ppsspp.orig/ext/CMakeLists.txt 2021-10-01 17:28:30.136664237 +0200
+++ libretro-ppsspp/ext/CMakeLists.txt 2021-10-01 17:30:45.282654341 +0200
@@ -22,4 +22,3 @@ add_subdirectory(SPIRV-Cross-build)
if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO)
add_subdirectory(discord-rpc-build)
endif()
-add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)

View file

@ -1,19 +1,18 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.11.3
version=1.12.3
revision=1
_lang_commit=6bd5b4bc983917ea8402f73c726b46e36f3de0b4
_glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
_SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
_discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a
_miniupnp_commit=7e229ddd635933239583ab190d9b614bde018157
_discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33
_miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
build_style=cmake
configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
-DUSING_QT_UI=$(vopt_if qt ON OFF)"
-DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=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
snappy-devel rapidjson libpng-devel libzstd-devel
$(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel)
$(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
depends="desktop-file-utils"
@ -23,19 +22,17 @@ 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
https://github.com/hrydgard/miniupnp/archive/${_miniupnp_commit}.tar.gz"
checksum="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516
b6e9fe4a7daa2dd8d4f3cc74cbafc5382f7df90303af3a3c18d25ec4492d8899
699e177e0022f17c204e3542bbf7fcb6843923095968edc1ebbc5124e85a2bdf
456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26
checksum="c9458ab1946d7d665465f69aafdf8598179852fefdcd7aef9050f7278193bec5
32edc362238d5b1136b2b40b0abdeef5a832e599554d2fcf75d7b08e4b0ed0bb
9423aebd6ea4251c6ea736f0291066eb2b99b6f923151edd1a78ce9c29b46757
f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d
20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e
6819f0984fa647f69a74831a2333859a07099f64098ce58c35d8604d19532d3d"
8f4115999391f95f443615fc5b13cb2398926ac4c418d3d34ff5735f71c6faea
1b1d2897f66835ea5eeec5851fe8757aca5afd86984107dcdc0e4b1ce2f2f8be"
# ppsspp always tries to compile x86 unittest
# https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d
@ -50,8 +47,6 @@ build_options="wayland qt sdl2"
build_options_default="sdl2"
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