From cb8bc5252c1a9c168dff580bb34d57cac38fcd8f Mon Sep 17 00:00:00 2001
From: Florian Piesche <florian@yellowkeycard.net>
Date: Fri, 8 Nov 2024 08:48:25 +0000
Subject: [PATCH] Review feedback; upgrade runtime to 6.8

---
 net.shadps4.shadps4.yml | 65 +++++++++++++----------------------------
 1 file changed, 20 insertions(+), 45 deletions(-)

diff --git a/net.shadps4.shadps4.yml b/net.shadps4.shadps4.yml
index 040e787..fa5dbde 100644
--- a/net.shadps4.shadps4.yml
+++ b/net.shadps4.shadps4.yml
@@ -1,6 +1,6 @@
 app-id: net.shadps4.shadps4
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: shadps4
 
@@ -19,14 +19,15 @@ finish-args:
   - --socket=fallback-x11
   # Audio
   - --socket=pulseaudio
-  # Discord rich presence?
   - --talk-name=org.kde.StatusNotifierWatcher
-  # Netplay? Does shadps4 even support that?
+  # Reading the game list is very slow through the XDG portal
+  # More filesystem overrides may need to be added by users
+  # depending on where they store their games but these
+  # are reasonable defaults for direct access.
   - --share=network
-  # I don't think we need filesystem access, do we?
-  # - --filesystem=home
-  # - --filesystem=/media
-  # - --filesystem=/run/media
+  - --filesystem=home
+  - --filesystem=/media
+  - --filesystem=/run/media
 
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm18
@@ -63,48 +64,22 @@ modules:
     cleanup:
       - '*'
 
-  # TODO: libfmt is included as a submodule in externals - do we need to build it separately?
-  # - name: libfmt
-  #   buildsystem: cmake-ninja
-  #   config-opts:
-  #     - -DFMT_TEST=OFF
-  #   sources:
-  #     - type: archive
-  #       url: https://api.github.com/repos/fmtlib/fmt/zipball/11.0.2
-  #       dest-filename: fmtlib.zip
-  #       sha256: 441b654cfeca7dab0b457e8c327b150f4af3fbf908f55d2adb0d2a27fcfcfa41
-  #       x-checker-data:
-  #           type: json
-  #           url: https://api.github.com/repos/fmtlib/fmt/releases/latest
-  #           version-query: .tag_name
-  #           url-query: .zipball_url
-  #   cleanup:
-  #     - '*'
-
-  # TODO: Original manifest by deadmeu included libevdev. Do we need this?
-  # TODO: shadps4 seems to build fine without it, even though it's listed as a requirement
-  # TODO: in https://github.com/shadps4-emu/shadPS4/blob/main/documents/building-linux.md
-  - name: evdev
-    buildsystem: meson
+  - name: libfmt
+    buildsystem: cmake-ninja
     config-opts:
-      - -Dtools=disabled
-      - -Dtests=disabled
-      - -Ddocumentation=disabled
-    cleanup:
-      - /bin
-      - /include
-      - /lib/pkgconfig
-      - /lib/*.la
-      - /share/man
+      - -DFMT_TEST=OFF
     sources:
       - type: archive
-        url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.3.tar.xz
-        sha256: abf1aace86208eebdd5d3550ffded4c8d73bb405b796d51c389c9d0604cbcfbf
+        url: https://api.github.com/repos/fmtlib/fmt/zipball/11.0.2
+        dest-filename: fmtlib.zip
+        sha256: 441b654cfeca7dab0b457e8c327b150f4af3fbf908f55d2adb0d2a27fcfcfa41
         x-checker-data:
-          type: anitya
-          project-id: 20540
-          stable-only: true
-          url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+            type: json
+            url: https://api.github.com/repos/fmtlib/fmt/releases/latest
+            version-query: .tag_name
+            url-query: .zipball_url
+    cleanup:
+      - '*'
 
   - name: shadps4
     buildsystem: cmake-ninja