summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoralucryd2021-06-25 07:31:56 +0000
committerDobroslaw Kijowski2021-08-13 22:02:41 +0200
commit250b343ee04951e64ed02a5274b027ffc3743aca (patch)
treedf9a01bf89e55dc5daa21e2e2c80114cb70ef050
parent666b504e30467232df161d4ae9f22d270df98b6e (diff)
downloadaur-250b343ee04951e64ed02a5274b027ffc3743aca.tar.gz
libretro-ppsspp 29976-1: FS#69766 fix license directory
git-svn-id: file:///srv/repos/svn-community/svn@967408 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--libretro-ppsspp-assets-path.patch8
3 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3036abc43614..16a171863932 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libretro-ppsspp-rbp
pkgdesc = Sony PlayStation Portable core (build for Raspberry Pi)
- pkgver = 29806
+ pkgver = 29976
pkgrel = 1
url = https://github.com/libretro/ppsspp
arch = armv7h
@@ -17,9 +17,9 @@ pkgbase = libretro-ppsspp-rbp
depends = libzip
depends = snappy
depends = zstd
- provides = libretro-ppsspp=29806
+ provides = libretro-ppsspp=29976
conflicts = libretro-ppsspp
- source = libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=138d81e14d9e71ea458b405df333fc015f84f460
+ source = libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=8e9b0122a8815d8c15c0d2cbff6a1f1828ca27fd
source = git+https://github.com/Kingcom/armips.git
source = git+https://github.com/discordapp/discord-rpc.git
source = ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
@@ -39,7 +39,7 @@ pkgbase = libretro-ppsspp-rbp
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5
+ sha256sums = c00fabec601ebf3e209871fe409d047ab47040c199e9e8e5f9ba0abdd9086ce6
sha256sums = c65ae3f20976a573b1a74600b02515e3f665513864a49e10db57c2fd170819e7
pkgname = libretro-ppsspp-rbp
diff --git a/PKGBUILD b/PKGBUILD
index ae45eda4c4ec..e68193571a85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=libretro-ppsspp
pkgname=libretro-ppsspp-rbp
-pkgver=29806
+pkgver=29976
pkgrel=1
pkgdesc='Sony PlayStation Portable core (build for Raspberry Pi)'
arch=(armv7h)
@@ -28,7 +28,7 @@ makedepends=(
ninja
python
)
-_commit=138d81e14d9e71ea458b405df333fc015f84f460
+_commit=8e9b0122a8815d8c15c0d2cbff6a1f1828ca27fd
source=(
libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
git+https://github.com/Kingcom/armips.git
@@ -51,7 +51,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5'
+ 'c00fabec601ebf3e209871fe409d047ab47040c199e9e8e5f9ba0abdd9086ce6'
'c65ae3f20976a573b1a74600b02515e3f665513864a49e10db57c2fd170819e7')
pkgver() {
@@ -63,7 +63,7 @@ pkgver() {
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 assets/lang ext/glslang ext/miniupnp; do
@@ -108,7 +108,7 @@ build() {
package() {
install -Dm 644 build/lib/ppsspp_libretro.so -t "${pkgdir}"/usr/lib/libretro/
- install -Dm 644 libretro-ppsspp/LICENSE.TXT -t "${pkgdir}"/usr/share/licenses/libretro-ppsspp-git/
+ install -Dm 644 libretro-ppsspp/LICENSE.TXT -t "${pkgdir}"/usr/share/licenses/libretro-ppsspp/
install -dm 755 "${pkgdir}"/usr/share/libretro/ppsspp
cp -dr --no-preserve=ownership build/assets "${pkgdir}"/usr/share/libretro/ppsspp/
}
diff --git a/libretro-ppsspp-assets-path.patch b/libretro-ppsspp-assets-path.patch
index 7a0bf0096ad6..76e424705b8c 100644
--- a/libretro-ppsspp-assets-path.patch
+++ b/libretro-ppsspp-assets-path.patch
@@ -1,6 +1,7 @@
---- libretro-ppsspp.orig/libretro/libretro.cpp 2020-10-08 22:13:25.641893000 +0200
-+++ libretro-ppsspp/libretro/libretro.cpp 2020-10-10 01:21:00.000136872 +0200
-@@ -601,6 +601,7 @@
+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_
g_Config.internalDataDirectory = retro_base_dir;
VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));
@@ -8,4 +9,3 @@
coreState = CORE_POWERUP;
ctx = LibretroGraphicsContext::CreateGraphicsContext();
-