[arch-commits] Commit in libretro-ppsspp/trunk (2 files)

[Maxime Gauduin]

    Date: Wednesday, November 24, 2021 @ 13:36:42
  Author: alucryd
Revision: 1054698

upgpkg: libretro-ppsspp 31158-1

Modified:
  libretro-ppsspp/trunk/PKGBUILD
Deleted:
  libretro-ppsspp/trunk/libretro-ppsspp-system-zstd.patch

-----------------------------------+
 PKGBUILD                          |    9 ++-----
 libretro-ppsspp-system-zstd.patch |   42 ------------------------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-24 13:36:39 UTC (rev 1054697)
+++ PKGBUILD	2021-11-24 13:36:42 UTC (rev 1054698)
@@ -3,7 +3,7 @@
 # Contributor: Duck Hunt <vaporeon at tfwno.gf>
 
 pkgname=libretro-ppsspp
-pkgver=30984
+pkgver=31158
 pkgrel=1
 pkgdesc='Sony PlayStation Portable core'
 arch=(x86_64)
@@ -31,7 +31,7 @@
   ninja
   python
 )
-_commit=030bfb1fb6529b52c65fc50971f353cdfca5c732
+_commit=c7bba9bf726264778884144578a29bb32c7725b0
 source=(
   libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
   git+https://github.com/Kingcom/armips.git
@@ -43,7 +43,6 @@
   git+https://github.com/KhronosGroup/SPIRV-Cross.git
   armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git
   libretro-ppsspp-assets-path.patch
-  libretro-ppsspp-system-zstd.patch
 )
 b2sums=('SKIP'
         'SKIP'
@@ -54,8 +53,7 @@
         'SKIP'
         'SKIP'
         'SKIP'
-        'c72640695e3e3b9512f13d71956872cea34b41cf28bd31c7dbd8062e1166d5ae8f248b01d6f5c73dd96d3ed5d5d59eab69c5619272525aefaa322cc2ca8b8541'
-        'c9fefb1456341f8bdc66ff787dd45e849c44a927dea7d9453ae507ed8d03e440651afe5795f929995a4e55a3b44ffb19fc1105b5621ec4917c8d17250dda1259')
+        'c72640695e3e3b9512f13d71956872cea34b41cf28bd31c7dbd8062e1166d5ae8f248b01d6f5c73dd96d3ed5d5d59eab69c5619272525aefaa322cc2ca8b8541')
 
 pkgver() {
   cd libretro-ppsspp
@@ -67,7 +65,6 @@
   cd libretro-ppsspp
 
   patch -Np1 -i ../libretro-ppsspp-assets-path.patch
-  patch -Np1 -i ../libretro-ppsspp-system-zstd.patch
 
   for submodule in ffmpeg assets/lang ext/glslang ext/miniupnp; do
     git submodule init ${submodule}

Deleted: libretro-ppsspp-system-zstd.patch
===================================================================
--- libretro-ppsspp-system-zstd.patch	2021-11-24 13:36:39 UTC (rev 1054697)
+++ libretro-ppsspp-system-zstd.patch	2021-11-24 13:36:42 UTC (rev 1054698)
@@ -1,42 +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)