From 1a52576be3bd252de65a518cafecd0a9a8bb40f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Wed, 13 Mar 2024 21:06:10 +0100
Subject: [PATCH] flatpak: Update Flatpak manifests

Update GitHub Flatpak builds to latest runtime version, add new libs
that we need and remove the ones that are not needed anymore.
---
 .github/workflows/flatpak.yml                 |  2 +-
 .../com.github.rafostar.Clapper-nightly.json  |  1 -
 pkgs/flatpak/com.github.rafostar.Clapper.json | 20 +++++++++++-------
 pkgs/flatpak/testing/libmicrodns.json         | 21 +++++++++++++++++++
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/flatpak/testing/libmicrodns.json

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 2bc67674..69560ccd 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 600
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-43
+      image: bilelmoussaoui/flatpak-github-actions:gnome-45
       options: --privileged
     strategy:
       matrix:
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index faa40d08..336f84d3 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -31,7 +31,6 @@
         "--filesystem=xdg-run/gvfsd",
         "--own-name=org.mpris.MediaPlayer2.Clapper",
         "--talk-name=org.gtk.vfs.*",
-        "--talk-name=org.gnome.Shell",
         "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
     ],
     "build-options": {
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json
index 0f84eddb..dbb1b04c 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper.json
@@ -1,9 +1,18 @@
 {
     "app-id": "com.github.rafostar.Clapper",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "43",
+    "runtime-version": "45",
     "sdk": "org.gnome.Sdk",
-    "command": "com.github.rafostar.Clapper",
+    "add-extensions": {
+        "org.freedesktop.Platform.ffmpeg-full": {
+            "version": "23.08",
+            "directory": "lib/ffmpeg",
+            "add-ld-path": ".",
+            "no-autodownload": false,
+            "autodelete": false
+        }
+    },
+    "command": "clapper",
     "separate-locales": false,
     "finish-args": [
         "--share=ipc",
@@ -18,13 +27,10 @@
         "--filesystem=xdg-run/gvfsd",
         "--own-name=org.mpris.MediaPlayer2.Clapper",
         "--talk-name=org.gtk.vfs.*",
-        "--talk-name=org.gnome.Shell",
         "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
     ],
     "modules": [
         "flathub/shared-modules/gudev/gudev.json",
-        "flathub/lib/libsass.json",
-        "flathub/lib/sassc.json",
         "flathub/lib/liba52.json",
         "flathub/lib/libmpeg2.json",
         "flathub/lib/libdv.json",
@@ -32,10 +38,9 @@
         "flathub/lib/libdvdread.json",
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
-        "flathub/lib/ffmpeg.json",
         "flathub/lib/uchardet.json",
+        "testing/libmicrodns.json",
         "flathub/gstreamer-1.0/gstreamer.json",
-        "flathub/lib/libadwaita.json",
         "testing/gtuber.json",
         {
             "name": "clapper",
@@ -52,6 +57,7 @@
         }
     ],
     "cleanup-commands": [
+        "mkdir -p /app/lib/ffmpeg",
         "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/"
     ]
 }
diff --git a/pkgs/flatpak/testing/libmicrodns.json b/pkgs/flatpak/testing/libmicrodns.json
new file mode 100644
index 00000000..79b19676
--- /dev/null
+++ b/pkgs/flatpak/testing/libmicrodns.json
@@ -0,0 +1,21 @@
+{
+    "name": "libmicrodns",
+    "buildsystem": "meson",
+    "config-opts": [
+        "--buildtype=release",
+        "-Dtests=disabled",
+        "-Dexamples=disabled"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/videolabs/libmicrodns.git",
+            "tag": "0.2.0",
+            "commit": "deb7ed7bf05dc26802a0ca1987049b31405b8930"
+        }
+    ]
+}