Update to 1.11

This commit is contained in:
out 2021-04-16 18:00:29 +08:00
parent 8bc8e9a152
commit d49579b2ba
2 changed files with 21 additions and 47 deletions

View file

@ -15,9 +15,6 @@
"--socket=x11", "--socket=x11",
"--share=network" "--share=network"
], ],
"cleanup": [
"/ffmpeg"
],
"modules": [ "modules": [
"shared-modules/glu/glu-9.json", "shared-modules/glu/glu-9.json",
"shared-modules/glew/glew.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", "name": "ppsspp",
"buildsystem": "cmake-ninja", "buildsystem": "simple",
"no-make-install": true,
"config-opts": [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DOpenGL_GL_PREFERENCE=GLVND"
],
"build-options": { "build-options": {
"arch":{ "arch":{
"aarch64": { "aarch64": {
"config-opts": ["-DUSING_GLES2=ON"] "env": {"EXTRA_OPTS":"-DUSING_GLES2=ON"}
} }
} }
}, },
"build-commands": [ "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", "mkdir -p /app/ppsspp /app/bin /app/share/applications",
"install -m755 PPSSPPSDL /app/ppsspp/", "install -m755 PPSSPPSDL /app/ppsspp/",
"ln -s /app/ppsspp/PPSSPPSDL /app/bin/ppsspp", "ln -s /app/ppsspp/PPSSPPSDL /app/bin/ppsspp",
@ -98,15 +62,25 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/hrydgard/ppsspp.git", "url": "https://github.com/hrydgard/ppsspp.git",
"commit": "087de849bdc74205dd00d8e6e11ba17a591213ab" "tag": "v1.11.3",
"disable-shallow-clone": true
}, },
{ {
"type": "shell", "type": "script",
"dest-filename": "ffmpeg/build.sh",
"only-arches": ["aarch64"],
"commands":[ "commands":[
"rm -r ffmpeg/linux", "rm -r linux",
"ln -s /app/ffmpeg/linux ffmpeg/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", "type": "file",
"path": "ppsspp.desktop" "path": "ppsspp.desktop"

@ -1 +1 @@
Subproject commit 2ea43be923edb2cef57aa4820b3cae391c440c8f Subproject commit b0d4c06751d0451c0a6cd9672b3132d6152f332c