From e751428d6c8f6086a2e8f416c8f26a52738e10ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Sun, 14 Apr 2024 17:23:33 +0200
Subject: [PATCH 1/3] workflows: Update to use latest versions of actions

---
 .github/workflows/flatpak-nightly.yml | 9 +++++----
 .github/workflows/flatpak.yml         | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml
index e643fc62..68018609 100644
--- a/.github/workflows/flatpak-nightly.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -16,7 +16,8 @@ jobs:
         arch: [x86_64, aarch64]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Install Docker
@@ -24,15 +25,15 @@ jobs:
         dnf -y install docker
     - name: Setup QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: arm64
     - name: Prepare Runtime
       run: |
         flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-nightly/${{ matrix.arch }}/23.08
         flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm16/${{ matrix.arch }}/23.08
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
-      name: Build
+    - name: Build
+      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 69560ccd..5e203cde 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -20,7 +20,8 @@ jobs:
         arch: [x86_64, aarch64]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Install Docker
@@ -28,11 +29,11 @@ jobs:
         dnf -y install docker
     - name: Setup QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: arm64
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
-      name: "Build"
+    - name: Build
+      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json

From 1a0158e775bf6db8b0e9fb7a7f01aff9d950b077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Sun, 14 Apr 2024 17:46:48 +0200
Subject: [PATCH 2/3] flatpak-nightly: Build dav1d from git master

---
 .../com.github.rafostar.Clapper-nightly.json  |  1 +
 pkgs/flatpak/testing/dav1d.json               | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/flatpak/testing/dav1d.json

diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index 6d2de5b2..c095c827 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -46,6 +46,7 @@
         "flathub/lib/libdvdread.json",
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
+        "testing/dav1d.json",
         "testing/gstreamer.json",
         "testing/gst-plugins-rs.json",
         "testing/gtuber.json",
diff --git a/pkgs/flatpak/testing/dav1d.json b/pkgs/flatpak/testing/dav1d.json
new file mode 100644
index 00000000..840fb4dc
--- /dev/null
+++ b/pkgs/flatpak/testing/dav1d.json
@@ -0,0 +1,25 @@
+{
+    "name": "dav1d",
+    "buildsystem": "meson",
+    "only-arches": [
+        "x86_64"
+    ],
+    "config-opts": [
+        "-Denable_tools=false",
+        "-Denable_examples=false",
+        "-Denable_tests=false",
+        "-Denable_docs=false",
+        "-Dlogging=false"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://code.videolan.org/videolan/dav1d.git",
+            "branch": "master"
+        }
+    ]
+}

From 484f2402a35b411f982dc75f1e1bf419f26ef653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Mon, 15 Apr 2024 20:07:07 +0200
Subject: [PATCH 3/3] flatpak-nightly: Update manifest

In latest git, binary name is now simply "clapper". Also we now depend on libmicrodns for the server feature to be available.
---
 pkgs/flatpak/com.github.rafostar.Clapper-nightly.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index c095c827..c54b0331 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -16,7 +16,7 @@
             "autodelete": false
         }
     },
-    "command": "com.github.rafostar.Clapper",
+    "command": "clapper",
     "separate-locales": false,
     "finish-args": [
         "--share=ipc",
@@ -46,6 +46,7 @@
         "flathub/lib/libdvdread.json",
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
+        "testing/libmicrodns.json",
         "testing/dav1d.json",
         "testing/gstreamer.json",
         "testing/gst-plugins-rs.json",