aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn <me@johnnynator.dev>2022-11-01 13:50:49 +0000
committerJohn <me@johnnynator.dev>2022-11-01 14:28:27 +0000
commitf4ab31d2efd196a64a8e081e1daecc0baab0e197 (patch)
tree24422df852bf41e96058e899999b236ab62e36ad
parentda7a3c4d9067a7907ccb389e46f60f9ebd5c214b (diff)
downloadvoid-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar.gz
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar.bz2
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar.lz
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar.xz
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.tar.zst
void-packages-f4ab31d2efd196a64a8e081e1daecc0baab0e197.zip
ppsspp: update to 1.13.2.
-rw-r--r--srcpkgs/ppsspp/patches/disable-glslang-tests.patch11
-rw-r--r--srcpkgs/ppsspp/patches/system-zstd.patch43
-rw-r--r--srcpkgs/ppsspp/patches/unittest.patch20
-rw-r--r--srcpkgs/ppsspp/template4
4 files changed, 13 insertions, 65 deletions
diff --git a/srcpkgs/ppsspp/patches/disable-glslang-tests.patch b/srcpkgs/ppsspp/patches/disable-glslang-tests.patch
new file mode 100644
index 00000000000..3837d15654a
--- /dev/null
+++ b/srcpkgs/ppsspp/patches/disable-glslang-tests.patch
@@ -0,0 +1,11 @@
+--- a/ext/glslang/CMakeLists.txt 2021-02-21 10:08:39.000000000 +0100
++++ - 2022-11-01 15:26:49.372613144 +0100
+@@ -327,7 +327,7 @@
+ add_subdirectory(gtests)
+ endif()
+
+-if(ENABLE_CTEST AND BUILD_TESTING)
++if(ENABLE_CTEST AND BUILD_TESTING AND ENABLE_GLSLANG_BINARIES)
+ # glslang-testsuite runs a bash script on Windows.
+ # Make sure to use '-o igncr' flag to ignore carriage returns (\r).
+ set(IGNORE_CR_FLAG "")
diff --git a/srcpkgs/ppsspp/patches/system-zstd.patch b/srcpkgs/ppsspp/patches/system-zstd.patch
deleted file mode 100644
index 9cd2d27e0db..00000000000
--- a/srcpkgs/ppsspp/patches/system-zstd.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-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)
diff --git a/srcpkgs/ppsspp/patches/unittest.patch b/srcpkgs/ppsspp/patches/unittest.patch
deleted file mode 100644
index dcba4a60746..00000000000
--- a/srcpkgs/ppsspp/patches/unittest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +0100
-+++ b/unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +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 <math.h>
- #include "Common/Common.h"
- #include "Common/TimeUtil.h"
- #include "Core/Config.h"
---- a/CMakeLists.txt 2021-03-02 21:50:51.000000000 +0100
-+++ b/CMakeLists.txt 2021-03-02 21:50:51.000000000 +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 19dbeb7f7b2..0f8bd03de69 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,6 +1,6 @@
# Template file for 'ppsspp'
pkgname=ppsspp
-version=1.12.3
+version=1.13.2
revision=1
_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
@@ -28,7 +28,7 @@ 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"
-checksum="c9458ab1946d7d665465f69aafdf8598179852fefdcd7aef9050f7278193bec5
+checksum="1a7d9962ac47feb2bf2866fee9aea7883352a6334a14436d8e02d37a6fa68943
32edc362238d5b1136b2b40b0abdeef5a832e599554d2fcf75d7b08e4b0ed0bb
9423aebd6ea4251c6ea736f0291066eb2b99b6f923151edd1a78ce9c29b46757
f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d