Merge pull request #15 from flathub/1.11

Update to 1.11

appdata.xml

@@ -20,6 +20,7 @@
     <screenshot>https://raw.githubusercontent.com/flathub/org.ppsspp.PPSSPP/master/screenshots/4.png</screenshot>
   </screenshots>
   <releases>
+    <release version="1.11.3" date="2021-06-10"/>
     <release version="1.10.0" date="2020-06-27"/>
     <release version="1.9.4" date="2019-10-17"/>
     <release version="1.8.0" date="2019-03-14"/>

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,57 +36,21 @@
         }
       ]
     },
-    {
-      "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",
+      "buildsystem": "simple",
-      "no-make-install": true,
-      "config-opts": [
-        "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-        "-DOpenGL_GL_PREFERENCE=GLVND"
-      ],
       "build-options": {
         "arch":{
           "aarch64": {
-            "config-opts": ["-DUSING_GLES2=ON"]
+            "env": {"EXTRA_OPTS":"-DUSING_GLES2=ON"}
           }
         }
       },
       "build-commands": [
-        "mkdir -p /app/ppsspp /app/bin /app/share/applications",
+        "cd ffmpeg && ../ffmpeg-build.sh",
-        "install -m755 PPSSPPSDL /app/ppsspp/",
+        "cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${FLATPAK_DEST} ${EXTRA_OPTS} .",
-        "ln -s /app/ppsspp/PPSSPPSDL /app/bin/ppsspp",
+        "make -j${FLATPAK_BUILDER_N_JOBS} && make install",
-        "cp -dr assets /app/ppsspp/",
+        "ln -s /app/bin/PPSSPPSDL /app/bin/ppsspp",
         "install -Dm644 icons/icon-512.svg /app/share/icons/hicolor/scalable/apps/ppsspp.svg",
         "install -m644 ppsspp.desktop /app/share/applications/",
         "install -Dm644 appdata.xml /app/share/appdata/ppsspp.appdata.xml"
@@ -98,15 +59,24 @@
         {
           "type": "git",
           "url": "https://github.com/hrydgard/ppsspp.git",
-          "commit": "087de849bdc74205dd00d8e6e11ba17a591213ab"
+          "tag": "v1.11.3"
         },
         {
-          "type": "shell",
+          "type": "script",
-          "commands": [
+          "dest-filename": "ffmpeg-build.sh",
-            "rm -r ffmpeg/linux",
+          "only-arches": ["aarch64"],
-            "ln -s /app/ffmpeg/linux ffmpeg/linux"
+          "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"

shared-modules

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