From d49579b2baaa7a51d25422e43065f6e5ca256d2d Mon Sep 17 00:00:00 2001 From: out Date: Fri, 16 Apr 2021 18:00:29 +0800 Subject: [PATCH] Update to 1.11 --- org.ppsspp.PPSSPP.json | 66 +++++++++++++----------------------------- shared-modules | 2 +- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/org.ppsspp.PPSSPP.json b/org.ppsspp.PPSSPP.json index cebf46e..0159966 100644 --- a/org.ppsspp.PPSSPP.json +++ b/org.ppsspp.PPSSPP.json @@ -15,9 +15,6 @@ "--socket=x11", "--share=network" ], - "cleanup": [ - "/ffmpeg" - ], "modules": [ "shared-modules/glu/glu-9.json", "shared-modules/glew/glew.json", @@ -39,53 +36,20 @@ } ] }, - { - "name": "ppsspp-ffmpeg", - "buildsystem": "simple", - "build-commands": [ - "rm -r ./linux", - "./build.sh", - "mkdir -p /app/ffmpeg && cp -r ./linux /app/ffmpeg/" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/hrydgard/ppsspp-ffmpeg.git", - "commit": "55147e5f33f5ae4904f75ec082af809267122b94" - }, - { - "type": "script", - "dest-filename": "build.sh", - "only-arches": ["aarch64"], - "commands":[ - "sed -i 's/GENERAL=/GENERAL_NO=/' linux_arm64.sh", - "./linux_arm64.sh" - ] - }, - { - "type": "script", - "dest-filename": "build.sh", - "only-arches": ["x86_64"], - "commands":["./linux_x86-64.sh"] - } - ] - }, { "name": "ppsspp", - "buildsystem": "cmake-ninja", - "no-make-install": true, - "config-opts": [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo", - "-DOpenGL_GL_PREFERENCE=GLVND" - ], + "buildsystem": "simple", "build-options": { "arch":{ "aarch64": { - "config-opts": ["-DUSING_GLES2=ON"] + "env": {"EXTRA_OPTS":"-DUSING_GLES2=ON"} } } }, "build-commands": [ + "cd ffmpeg && ./build.sh", + "cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOpenGL_GL_PREFERENCE=GLVND ${EXTRA_OPTS} .", + "make", "mkdir -p /app/ppsspp /app/bin /app/share/applications", "install -m755 PPSSPPSDL /app/ppsspp/", "ln -s /app/ppsspp/PPSSPPSDL /app/bin/ppsspp", @@ -98,15 +62,25 @@ { "type": "git", "url": "https://github.com/hrydgard/ppsspp.git", - "commit": "087de849bdc74205dd00d8e6e11ba17a591213ab" + "tag": "v1.11.3", + "disable-shallow-clone": true }, { - "type": "shell", - "commands": [ - "rm -r ffmpeg/linux", - "ln -s /app/ffmpeg/linux ffmpeg/linux" + "type": "script", + "dest-filename": "ffmpeg/build.sh", + "only-arches": ["aarch64"], + "commands":[ + "rm -r linux", + "sed -i 's/GENERAL=/GENERAL_NO=/' linux_arm64.sh", + "./linux_arm64.sh" ] }, + { + "type": "script", + "dest-filename": "ffmpeg/build.sh", + "only-arches": ["x86_64"], + "commands":["rm -r linux", "./linux_x86-64.sh"] + }, { "type": "file", "path": "ppsspp.desktop" diff --git a/shared-modules b/shared-modules index 2ea43be..b0d4c06 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 2ea43be923edb2cef57aa4820b3cae391c440c8f +Subproject commit b0d4c06751d0451c0a6cd9672b3132d6152f332c