[arch-commits] Commit in ppsspp/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Thursday, November 1, 2018 @ 08:12:55
  Author: alucryd
Revision: 401032

upgpkg: ppsspp 1.7-1

Modified:
  ppsspp/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 07:54:46 UTC (rev 401031)
+++ PKGBUILD	2018-11-01 08:12:55 UTC (rev 401032)
@@ -6,7 +6,7 @@
 
 pkgbase=ppsspp
 pkgname=('ppsspp' 'ppsspp-headless' 'ppsspp-qt')
-pkgver=1.6.3
+pkgver=1.7
 pkgrel=1
 pkgdesc='A PSP emulator written in C++'
 arch=('x86_64')
@@ -15,11 +15,14 @@
 depends=('glew' 'libgl' 'sdl2' 'snappy' 'zlib')
 makedepends=('cmake' 'git' 'libzip' 'qt5-tools')
 source=("git+https://github.com/hrydgard/ppsspp.git#tag=v${pkgver}"
-        'git+https://github.com/hrydgard/ppsspp-ffmpeg.git'
+        'git+https://github.com/Kingcom/armips.git'
+        'git+https://github.com/discordapp/discord-rpc.git'
+        'ppsspp-ffmpeg::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'
-        'git+https://github.com/Kingcom/armips.git'
+        'git+https://github.com/Tencent/rapidjson.git'
         'git+https://github.com/KhronosGroup/SPIRV-Cross.git'
+        'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git'
         'ppsspp.sh'
         'ppsspp-headless.sh'
         'ppsspp-qt.sh'
@@ -32,6 +35,9 @@
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             '2c2d1ee6d1ce5c2acec372d58b8079885f6d5d674633cfea489cd550252a5426'
             '1236ce000bb670ee2c0e0645c3d55f4d8c8e74dbc35a1af0962a3bdd7608f1c5'
             '828b06aacc56672a4d953d77342717c5be414a68261025f74e466abd084b8e6b'
@@ -49,12 +55,22 @@
     git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
     git submodule update ${submodule}
   done
-  for submodule in ext/{SPIRV-Cross,armips}; do
+  for submodule in ext/{armips,discord-rpc,rapidjson,SPIRV-Cross}; do
     git submodule init ${submodule}
     git config submodule.${submodule}.url ../${submodule#*/}
     git submodule update ${submodule}
   done
 
+  pushd ext/armips
+
+  for submodule in ext/tinyformat; do
+    git submodule init ${submodule}
+    git config submodule.${submodule}.url ../../../armips-${submodule#*/}
+    git submodule update ${submodule}
+  done
+
+  popd
+
   for ui in sdl qt; do
     if [[ -d build-$ui ]]; then
       rm -rf build-$ui
@@ -78,8 +94,8 @@
   cmake .. \
     -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_SKIP_RPATH='ON' \
-    -DUSING_QT_UI='ON' \
-    -DUSE_SYSTEM_LIBZIP='ON'
+    -DUSE_SYSTEM_LIBZIP='ON' \
+    -DUSING_QT_UI='ON'
   make
 }