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

[Maxime Gauduin]

    Date: Friday, October 1, 2021 @ 15:45:03
  Author: alucryd
Revision: 1026412

upgpkg: libretro-ppsspp 30774-1

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

-----------------------------------+
 PKGBUILD                          |   30 ++++++++++++++++--------------
 libretro-ppsspp-assets-path.patch |   15 ++++++++-------
 libretro-ppsspp-system-zstd.patch |   16 ++++++++--------
 3 files changed, 32 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-01 15:44:59 UTC (rev 1026411)
+++ PKGBUILD	2021-10-01 15:45:03 UTC (rev 1026412)
@@ -3,7 +3,7 @@
 # Contributor: Duck Hunt <vaporeon at tfwno.gf>
 
 pkgname=libretro-ppsspp
-pkgver=30424
+pkgver=30774
 pkgrel=1
 pkgdesc='Sony PlayStation Portable core'
 arch=(x86_64)
@@ -18,6 +18,8 @@
   libpng
   libretro-core-info
   libzip
+  ppsspp-assets
+  sdl2
   snappy
   zlib
   zstd
@@ -29,7 +31,7 @@
   ninja
   python
 )
-_commit=5e4c478f437bc612b795b9765f0aaaf4480bf430
+_commit=b1009f70f9badba5b06ee3f75a8856aed1606d8e
 source=(
   libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
   git+https://github.com/Kingcom/armips.git
@@ -43,17 +45,17 @@
   libretro-ppsspp-assets-path.patch
   libretro-ppsspp-system-zstd.patch
 )
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'c00fabec601ebf3e209871fe409d047ab47040c199e9e8e5f9ba0abdd9086ce6'
-            'c65ae3f20976a573b1a74600b02515e3f665513864a49e10db57c2fd170819e7')
+b2sums=('SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        '535a9c3c09835104fa8f57be34eedda8281f28029fa963ccefb6c56f310ac0fc799e8dd52825ad70dd180905142b132fdd1dac30e526da65417082b1b57d2f59'
+        'c9fefb1456341f8bdc66ff787dd45e849c44a927dea7d9453ae507ed8d03e440651afe5795f929995a4e55a3b44ffb19fc1105b5621ec4917c8d17250dda1259')
 
 pkgver() {
   cd libretro-ppsspp
@@ -64,7 +66,7 @@
 prepare() {
   cd libretro-ppsspp
 
-  #patch -Np1 -i ../libretro-ppsspp-assets-path.patch
+  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

Modified: libretro-ppsspp-assets-path.patch
===================================================================
--- libretro-ppsspp-assets-path.patch	2021-10-01 15:44:59 UTC (rev 1026411)
+++ libretro-ppsspp-assets-path.patch	2021-10-01 15:45:03 UTC (rev 1026412)
@@ -1,11 +1,12 @@
 diff '--color=auto' -rupN libretro-ppsspp.orig/libretro/libretro.cpp libretro-ppsspp/libretro/libretro.cpp
---- libretro-ppsspp.orig/libretro/libretro.cpp	2021-06-21 09:03:06.545949438 +0200
-+++ libretro-ppsspp/libretro/libretro.cpp	2021-06-21 09:04:16.762486223 +0200
-@@ -637,6 +637,7 @@ bool retro_load_game(const struct retro_
+--- libretro-ppsspp.orig/libretro/libretro.cpp	2021-10-01 16:59:56.706788890 +0200
++++ libretro-ppsspp/libretro/libretro.cpp	2021-10-01 17:02:51.683172829 +0200
+@@ -488,7 +488,7 @@ void retro_init(void)
+    g_Config.flash0Directory = retro_base_dir / "flash0";
     g_Config.internalDataDirectory = retro_base_dir;
  
-    VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));
-+   VFSRegister("", new DirectoryAssetReader("/usr/share/libretro/ppsspp/assets/"));
+-   VFSRegister("", new DirectoryAssetReader(retro_base_dir));
++   VFSRegister("", new DirectoryAssetReader(Path("/usr/share/libretro/ppsspp/assets")));
  
-    coreState = CORE_POWERUP;
-    ctx       = LibretroGraphicsContext::CreateGraphicsContext();
+    host = new LibretroHost();
+ }

Modified: libretro-ppsspp-system-zstd.patch
===================================================================
--- libretro-ppsspp-system-zstd.patch	2021-10-01 15:44:59 UTC (rev 1026411)
+++ libretro-ppsspp-system-zstd.patch	2021-10-01 15:45:03 UTC (rev 1026412)
@@ -1,15 +1,15 @@
 diff '--color=auto' -rupN libretro-ppsspp.orig/CMakeLists.txt libretro-ppsspp/CMakeLists.txt
---- libretro-ppsspp.orig/CMakeLists.txt	2021-05-07 09:02:42.107209058 +0200
-+++ libretro-ppsspp/CMakeLists.txt	2021-05-07 09:10:24.353248166 +0200
-@@ -135,6 +135,7 @@ option(USE_MINIUPNPC "Build with miniUPn
+--- 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)
- option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
- 
-@@ -1817,8 +1818,20 @@ if(ANDROID)
+@@ -1976,8 +1977,20 @@ if(ANDROID)
  	endif()
  endif()
  
@@ -33,8 +33,8 @@
  # 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-05-07 09:02:41.033776512 +0200
-+++ libretro-ppsspp/ext/CMakeLists.txt	2021-05-07 09:11:00.643266519 +0200
+--- 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)