ppsspp-git-r19085.01669cb-1: updating version

1 files changed, 19 insertions, 27 deletions

diff --git a/pcr/ppsspp-git/PKGBUILD b/pcr/ppsspp-git/PKGBUILD
index 388d750c8..1ff26fd99 100644
--- a/pcr/ppsspp-git/PKGBUILD
+++ b/pcr/ppsspp-git/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgbase=ppsspp
 pkgbase=ppsspp-git
 pkgname=('ppsspp-git' 'ppsspp-qt-git')
-pkgver=r16696.14fd313
+pkgver=r19085.01669cb
 pkgrel=1
 pkgdesc='A PSP emulator written in C++'
 arch=('i686' 'x86_64')
@@ -15,14 +15,12 @@ depends=('ffmpeg' 'sdl2')
 makedepends=('cmake' 'git' 'glu' 'qt5-tools')
 source=("git+https://github.com/hrydgard/ppsspp.git"
         'git+https://github.com/hrydgard/ppsspp-lang.git'
-        'ppsspp-native::git+https://github.com/hrydgard/native.git'
         'ppsspp-armips::git+https://github.com/Kingcom/armips.git'
-        'ppsspp-ffmpeg.patch')
+        'ppsspp.desktop')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '28c4fcfb1a42f17c5a6bd5909696a53481efcd3571b0a30b1e1e535015d6aa1a')
+            '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8')
 
 pkgver() {
   cd ppsspp
@@ -32,34 +30,30 @@ pkgver() {
 prepare() {
   cd ppsspp
 
-  for submodule in native lang ext/armips; do
+  for submodule in lang ext/armips; do
     git submodule init ${submodule}
     git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
     git submodule update ${submodule}
   done
 
-  patch -Np1 -i ../ppsspp-ffmpeg.patch  
+  for ui in sdl qt; do
+    if [[ -d build-$ui ]]; then
+      rm -rf build-$ui
+    fi
+    mkdir build-$ui
+  done
 }
 
 build() {
-  cd ppsspp
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build && cd build
+  cd ppsspp/build-sdl
 
   cmake .. \
     -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_SKIP_RPATH='TRUE'
+    -DCMAKE_SKIP_RPATH='TRUE' \
+    -DUSE_SYSTEM_FFMPEG='TRUE'
   make
 
-  cd ..
-
-  if [[ -d build-qt ]]; then
-    rm -rf build-qt
-  fi
-  mkdir build-qt && cd build-qt
+  cd ../build-qt
 
   qmake-qt5 CONFIG+='release' CONFIG+='system_ffmpeg' ../Qt/PPSSPPQt.pro
   make
@@ -69,14 +63,13 @@ package_ppsspp-git() {
   provides=("${_pkgbase}")
   conflicts=("${_pkgbase}" "${_pkgbase}-qt" "${_pkgbase}-qt-git")
 
-  cd ppsspp/build
+  cd ppsspp/build-sdl
 
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps,ppsspp}}
+  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps,ppsspp}}
   install -m 755 PPSSPPSDL "${pkgdir}"/usr/bin/ppsspp
   cp -dr --no-preserve='ownership' assets "${pkgdir}"/usr/share/ppsspp/
   install -m 644 ../assets/unix-icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
-  install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/
-  install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/
+  install -m 644 ../../ppsspp.desktop "${pkgdir}"/usr/share/applications/
 }
 
 package_ppsspp-qt-git() {
@@ -86,11 +79,10 @@ package_ppsspp-qt-git() {
 
   cd ppsspp/build-qt
 
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps}}
+  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
   install -m 755 ppsspp "${pkgdir}"/usr/bin/
   install -m 644 ../assets/unix-icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
-  install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/
-  install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/
+  install -m 644 ../../ppsspp.desktop "${pkgdir}"/usr/share/applications/
 }
 
 # vim: ts=2 sw=2 et: