aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiaz Urbaneja Victor Diego Alenjandro <sodomon2@gmail.com>2021-02-13 15:50:21 -0400
committerLeo <thinkabit.ukim@gmail.com>2021-02-13 20:15:54 +0000
commita2be3362195c4f94c68cd2d250db5b27e37b3614 (patch)
treefffae227a84b294c1cd17e8ff5924e24d5001821
parent283025b7b3d9f50fae1ee371faeb103ddc5d5926 (diff)
downloadaports-a2be3362195c4f94c68cd2d250db5b27e37b3614.tar.gz
aports-a2be3362195c4f94c68cd2d250db5b27e37b3614.tar.bz2
aports-a2be3362195c4f94c68cd2d250db5b27e37b3614.tar.xz
testing/ppsspp: upgrade to 1.11
PPSSPP - a fast and portable PSP emulator https://www.ppsspp.org/
-rw-r--r--testing/ppsspp/APKBUILD46
-rwxr-xr-xtesting/ppsspp/ppsspp-headless3
-rw-r--r--testing/ppsspp/ppsspp-version.patch2
3 files changed, 21 insertions, 30 deletions
diff --git a/testing/ppsspp/APKBUILD b/testing/ppsspp/APKBUILD
index acd9529a3e..04f19f6d62 100644
--- a/testing/ppsspp/APKBUILD
+++ b/testing/ppsspp/APKBUILD
@@ -1,21 +1,21 @@
# Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com>
# Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com>
pkgname=ppsspp
-pkgver=1.10.2
+pkgver=1.11
pkgrel=0
pkgdesc="PPSSPP - a fast and portable PSP emulator"
url="https://www.ppsspp.org/"
-arch="x86_64" # only available on x86_64 due to compiling problems
+arch="x86_64 x86"
_armips_commit="7885552b208493a6a0f21663770c446c3ba65576"
_discord_commit="3d3ae7129d17643bc706da0a2eea85aafd10ab3a"
_glslang_commit="d0850f875ec392a130ccf00018dab458b546f27c"
_spirv_cross_commit="a1f7c8dc8ea2f94443951ee27003bffa562c1f13"
_rapidjson_commit="73063f5002612c6bf64fe24f851cd5cc0d83eef9"
-_lang_commit="942934a3d55f600622fb3f3ad60ecc1f3da23b6b"
-_ffmpeg_commit="55147e5f33f5ae4904f75ec082af809267122b94"
+_lang_commit="567b22525b115751ee3ae2ed2c8b046034c9dd8d"
+_miniupnp_commit="7e229ddd635933239583ab190d9b614bde018157"
license="GPL-2.0-only"
makedepends="make glew-dev libzip-dev snappy-dev mesa-dev qt5-qtbase-dev
- zlib-dev sdl2-dev cmake coreutils qt5-qtmultimedia-dev"
+ zlib-dev sdl2-dev cmake coreutils qt5-qtmultimedia-dev ffmpeg-dev python3"
options="!check" # make check not implemented
source="ppsspp-$pkgver.tar.gz::https://github.com/hrydgard/ppsspp/archive/v$pkgver.tar.gz
ppsspp-$pkgver-armips.tar.gz::https://github.com/Kingcom/armips/archive/$_armips_commit.tar.gz
@@ -24,11 +24,10 @@ source="ppsspp-$pkgver.tar.gz::https://github.com/hrydgard/ppsspp/archive/v$pkgv
ppsspp-$pkgver-SPIRV-Cross.tar.gz::https://github.com/KhronosGroup/SPIRV-Cross/archive/$_spirv_cross_commit.tar.gz
ppsspp-$pkgver-rapidjson.tar.gz::https://github.com/Tencent/rapidjson/archive/$_rapidjson_commit.tar.gz
ppsspp-$pkgver-lang.tar.gz::https://github.com/hrydgard/ppsspp-lang/archive/$_lang_commit.tar.gz
- ppsspp-$pkgver-ffmpeg.tar.gz::https://github.com/hrydgard/ppsspp-ffmpeg/archive/$_ffmpeg_commit.tar.gz
+ ppsspp-$pkgver-miniupnp.tar.gz::https://github.com/hrydgard/miniupnp/archive/$_miniupnp_commit.tar.gz
ppsspp.desktop
ppsspp
- ppsspp-version.patch
- ppsspp-headless"
+ ppsspp-version.patch"
prepare() {
default_prepare
@@ -38,29 +37,25 @@ prepare() {
mv "$srcdir/"glslang-$_glslang_commit/* "$builddir"/ext/glslang/
mv "$srcdir/"rapidjson-$_rapidjson_commit/* "$builddir"/ext/rapidjson/
mv "$srcdir/"SPIRV-Cross-$_spirv_cross_commit/* "$builddir"/ext/SPIRV-Cross/
+ mv "$srcdir/"miniupnp-$_miniupnp_commit/* "$builddir"/ext/miniupnp/
mv "$srcdir/"$pkgname-lang-$_lang_commit/* "$builddir"/assets/lang/
- mv "$srcdir/"$pkgname-ffmpeg-$_ffmpeg_commit/* "$builddir"/ffmpeg
- cd "$builddir"/ffmpeg
- ./linux_x86-64.sh
}
build() {
mkdir build-qt
cd build-qt
cmake .. \
- -DUSING_QT_UI=ON \
- -DHEADLESS=ON
- make
+ -DUSE_SYSTEM_FFMPEG=ON \
+ -DUSING_QT_UI=ON
+ make
}
package() {
mkdir -p "$pkgdir"/usr/bin
install -m 755 $srcdir/ppsspp "$pkgdir"/usr/bin/ppsspp
- install -m 755 $srcdir/ppsspp-headless "$pkgdir"/usr/bin/ppsspp-headless
mkdir -p "$pkgdir"/usr/share/ppsspp
mv build-qt/assets "$pkgdir"/usr/share/ppsspp
cp -Rp build-qt/PPSSPPQt "$pkgdir"/usr/share/ppsspp
- cp -Rp build-qt/PPSSPPHeadless "$pkgdir"/usr/share/ppsspp
mkdir -p "$pkgdir"/usr/share/applications
install -m 644 $srcdir/ppsspp.desktop "$pkgdir"/usr/share/applications/ppsspp.desktop
mkdir -p "$pkgdir"/usr/share/pixmaps
@@ -68,15 +63,14 @@ package() {
}
-sha512sums="d75a0e0d6f195e1e68ea9fe0c393ea78ee9ae168c425a2be9aca1b4ead0bdfdd14d8066bc4deb57d6df012860621d1a49911b477879e97d5c55d352bb1dc92c9 ppsspp-1.10.2.tar.gz
-2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be ppsspp-1.10.2-armips.tar.gz
-17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af ppsspp-1.10.2-discord-rpc.tar.gz
-153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3 ppsspp-1.10.2-glslang.tar.gz
-b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65 ppsspp-1.10.2-SPIRV-Cross.tar.gz
-3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc ppsspp-1.10.2-rapidjson.tar.gz
-ce3c8426e7b580fa4f4392ff8f60e387c3989675d1ee2edb2b6ef932b6688fc1b4f75f041a848bf8e6ca42a5b5ed186ab66c77276195f0bf186b4fa8625396a3 ppsspp-1.10.2-lang.tar.gz
-ec8145ef511561e91ca49d96042577120b62bb54ee859c4848d6ea46831c5fdc10f0d539301f367dfb6858c966983a0fff159eef049f3ba1ddff81cb30376b20 ppsspp-1.10.2-ffmpeg.tar.gz
+sha512sums="de3c7a275151bb29db750a1e76f4c6b44990d85cb948a347acdc2f21013e3e730c1b04d72b4c07a9a21710eb449989da57b276530a0f2403ce4d954e4122b041 ppsspp-1.11.tar.gz
+2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be ppsspp-1.11-armips.tar.gz
+17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af ppsspp-1.11-discord-rpc.tar.gz
+153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3 ppsspp-1.11-glslang.tar.gz
+b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65 ppsspp-1.11-SPIRV-Cross.tar.gz
+3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc ppsspp-1.11-rapidjson.tar.gz
+4cc8c98f2de35e4585773dba38e39764018fcc64cad00b37976263ac63a003b8fd43bdbab0b820fbfb17fe5c205b9faa2f6d15f043e7d2e932cb72b18b42671c ppsspp-1.11-lang.tar.gz
+99f336d44f2cb53f2f79bd65726ea5209023efe264207255161d3b8a0452082ed1830b70db81d8bf5ebbf40db66ed391eb000306b2af0918dfa171093b2680e7 ppsspp-1.11-miniupnp.tar.gz
fb8c6c4a48003dac866b094f4d9d750bf7d1def14c9d3bf7a70f584ba187dacd5e57b29313e302740f5a0ec4bf27b6fea3d5cf27ae12bf6fac06f5a8ab23195b ppsspp.desktop
c22214c15b6e9305f688c25c5997248a6a04c2dc229ea8c2126f0d288be7386134d15fc210e07f70f7eee13b0ab7ff05befd5657de0fc897d947f23c94711cd0 ppsspp
-a3a88ad315f22e550545bbfb6af169334f042e7558ba44c756f4d0f71d98e67ea1d5b76adbd255e86e5961673667bfbe59f6a63d13bc7fda98496aef7db2d26d ppsspp-version.patch
-6bf0dbe793cadbaa59199d0c0c169609db619ac4bb4bf33f226e5503765a9fb090c919a757b990396d3a744dfa217bc34c3a47e5e601a94da47b351035639113 ppsspp-headless"
+c610a4576e941d6180c26fa6bf805f4dbf21a38ebf4519a02d6978e702b5efd1a600f636764947c89114d4f7fef05e72261da8ae99b59abe86a2ba11d0bcbc90 ppsspp-version.patch"
diff --git a/testing/ppsspp/ppsspp-headless b/testing/ppsspp/ppsspp-headless
deleted file mode 100755
index 21175735fa..0000000000
--- a/testing/ppsspp/ppsspp-headless
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/ppsspp
-exec ./PPSSPPHeadless "$@"
diff --git a/testing/ppsspp/ppsspp-version.patch b/testing/ppsspp/ppsspp-version.patch
index aec7a0d6d6..eef4361c68 100644
--- a/testing/ppsspp/ppsspp-version.patch
+++ b/testing/ppsspp/ppsspp-version.patch
@@ -5,7 +5,7 @@ I add the current version to ppsspp as the default is unknown
@@ -1,5 +1,5 @@
set(GIT_VERSION_FILE "${SOURCE_DIR}/git-version.cpp")
-set(GIT_VERSION "unknown")
-+set(GIT_VERSION "1.10.2")
++set(GIT_VERSION "1.11")
set(GIT_VERSION_UPDATE "1")
find_package(Git)