From d0bf0150139d0335a15a729fbf3ef1160a62d1f8 Mon Sep 17 00:00:00 2001
From: samy-k97 <66317077+samy-k97@users.noreply.github.com>
Date: Fri, 18 Jun 2021 19:13:54 +0100
Subject: [PATCH] Simplified the json file and removed the ppsspp.desktop file
 Changed command from ppsspp to PPSSPPSDL removed libzip Changed the
 buildsystem to cmake Added environment variables for CC and CXX for aarch64
 Defined config-opts for aarch64 Removed cleanup and build-commands Added
 post-install commands Removed Scripts

---
 org.ppsspp.PPSSPP.json | 63 ++++++++----------------------------------
 ppsspp.desktop         |  9 ------
 2 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 ppsspp.desktop

diff --git a/org.ppsspp.PPSSPP.json b/org.ppsspp.PPSSPP.json
index c790145..f7c0ac7 100644
--- a/org.ppsspp.PPSSPP.json
+++ b/org.ppsspp.PPSSPP.json
@@ -4,7 +4,7 @@
   "runtime": "org.freedesktop.Platform",
   "runtime-version": "20.08",
   "sdk": "org.freedesktop.Sdk",
-  "command": "ppsspp",
+  "command": "PPSSPPSDL",
   "finish-args": [
     "--device=all",
     "--filesystem=host:ro",
@@ -15,44 +15,23 @@
   "modules": [
     "shared-modules/glu/glu-9.json",
     "shared-modules/glew/glew.json",
-    {
-      "name": "libzip",
-      "buildsystem": "cmake-ninja",
-      "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"],
-      "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://libzip.org/download/libzip-1.7.3.tar.xz",
-          "sha256": "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132"
-        }
-      ]
-    },
     {
       "name": "ppsspp",
-      "buildsystem": "simple",
+      "buildsystem": "cmake",
       "build-options": {
-        "arch":{
+        "arch": {
           "aarch64": {
-            "env": {"EXTRA_OPTS":"-DUSING_GLES2=ON"}
+            "env": {
+              "CC": "clang",
+              "CXX": "clang++"
+            },
+            "config-opts": ["-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/raspberry.armv8.cmake"]
           }
         }
       },
-      "cleanup": [
-        "/share/applications/"
-      ],
-      "build-commands": [
-        "cd ffmpeg && ../ffmpeg-build.sh",
-        "cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${FLATPAK_DEST} ${EXTRA_OPTS} .",
-        "make -j${FLATPAK_BUILDER_N_JOBS} && make install",
-        "ln -s ${FLATPAK_DEST}/bin/PPSSPPSDL ${FLATPAK_DEST}/bin/ppsspp",
-        "install -Dm644 icons/icon-512.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg",
-        "install -Dm644 ppsspp.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop",
+      "post-install": [
+        "mv ${FLATPAK_DEST}/share/applications/{PPSSPPSDL,${FLATPAK_ID}}.desktop",
+        "desktop-file-edit --set-name=PPSSPP ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop",
         "install -Dm644 appdata.xml ${FLATPAK_DEST}/share/appdata/${FLATPAK_ID}.appdata.xml"
       ],
       "sources": [
@@ -61,26 +40,6 @@
           "url": "https://github.com/hrydgard/ppsspp.git",
           "tag": "v1.11.3"
         },
-        {
-          "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"
-        },
         {
           "type": "file",
           "path": "appdata.xml"
diff --git a/ppsspp.desktop b/ppsspp.desktop
deleted file mode 100644
index 49c4e92..0000000
--- a/ppsspp.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=PPSSPP
-GenericName=PSP Emulator
-Comment=PlayStation Portable Simulator Suitable for Playing Portably (PPSSPP)
-Exec=ppsspp %f
-Icon=org.ppsspp.PPSSPP
-Categories=Game