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

[Maxime Gauduin]

    Date: Friday, May 7, 2021 @ 07:18:47
  Author: alucryd
Revision: 928562

upgpkg: libretro-ppsspp 29742-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 07:12:41 UTC (rev 928561)
+++ PKGBUILD	2021-05-07 07:18:47 UTC (rev 928562)
@@ -3,7 +3,7 @@
 # Contributor: Duck Hunt <vaporeon at tfwno.gf>
 
 pkgname=libretro-ppsspp
-pkgver=29606
+pkgver=29742
 pkgrel=1
 pkgdesc='Sony PlayStation Portable core'
 arch=(x86_64)
@@ -20,18 +20,19 @@
   libzip
   snappy
   zlib
+  zstd
 )
 makedepends=(
   cmake
   git
   libglvnd
+  ninja
   python
 )
-_commit=0328a0d550840687b55f45dddcc0838b2c670aeb
+_commit=4462b0c612986cfdd585885eb56098d19c2181ec
 source=(
   libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
   git+https://github.com/Kingcom/armips.git
-  git+https://github.com/discordapp/discord-rpc.git
   git+https://github.com/hrydgard/ppsspp-ffmpeg.git
   ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
   git+https://github.com/hrydgard/ppsspp-lang.git
@@ -40,6 +41,7 @@
   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
 )
 sha256sums=('SKIP'
             'SKIP'
@@ -50,8 +52,8 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5')
+            '2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5'
+            'c65ae3f20976a573b1a74600b02515e3f665513864a49e10db57c2fd170819e7')
 
 pkgver() {
   cd libretro-ppsspp
@@ -63,6 +65,7 @@
   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}
@@ -69,7 +72,7 @@
     git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
     git submodule update ${submodule}
   done
-  for submodule in ext/{armips,discord-rpc,rapidjson,SPIRV-Cross}; do
+  for submodule in ext/{armips,rapidjson,SPIRV-Cross}; do
     git submodule init ${submodule}
     git config submodule.${submodule}.url ../${submodule#*/}
     git submodule update ${submodule}
@@ -85,7 +88,7 @@
 }
 
 build() {
-  cmake -S libretro-ppsspp -B build \
+  cmake -S libretro-ppsspp -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_SKIP_RPATH=ON \
     -DOpenGL_GL_PREFERENCE=GLVND \
@@ -96,8 +99,10 @@
     -DUNITTEST=OFF \
     -DUSE_SYSTEM_LIBZIP=ON \
     -DUSE_SYSTEM_SNAPPY=ON \
-    -DUSING_QT_UI=OFF
-  make -C build
+    -DUSE_SYSTEM_ZSTD=ON \
+    -DUSING_QT_UI=OFF \
+    -Wno-dev
+  cmake --build build
 }
 
 package() {

Added: libretro-ppsspp-system-zstd.patch
===================================================================
--- libretro-ppsspp-system-zstd.patch	                        (rev 0)
+++ libretro-ppsspp-system-zstd.patch	2021-05-07 07:18:47 UTC (rev 928562)
@@ -0,0 +1,42 @@
+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
+ 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_ASAN "Use address sanitizer" OFF)
+ option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
+ 
+@@ -1817,8 +1818,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-05-07 09:02:41.033776512 +0200
++++ libretro-ppsspp/ext/CMakeLists.txt	2021-05-07 09:11:00.643266519 +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)