diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml
index 08e5175eb..e4d2ecd66 100644
--- a/.github/workflows/flatpak-nightly.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -25,8 +25,8 @@ jobs:
         dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
         flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
         flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/25.08
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm21/${{ matrix.arch }}/25.08
         flatpak --system install -y --noninteractive flathub org.flatpak.Builder
     - name: Checkout
       uses: actions/checkout@v4
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 36a8c2fc6..a22688261 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -26,13 +26,18 @@ jobs:
     steps:
     - name: Prepare
       run: |
-        dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
+        dnf install -y jq git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
         flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
         flatpak --system install -y --noninteractive flathub org.flatpak.Builder
     - name: Checkout
       uses: actions/checkout@v4
       with:
         submodules: recursive
+    - name: Remove gstreamer ffmpeg-full patch
+      run: |
+        rm -f pkgs/flatpak/flathub/gstreamer-1.0/gst-libav-stop-caching-codecs.patch
+        jq 'del(.sources[] | select(.path == "gst-libav-stop-caching-codecs.patch"))' pkgs/flatpak/flathub/gstreamer-1.0/gstreamer.json > pkgs/flatpak/flathub/gstreamer-1.0/gstreamer.json.tmp
+        mv pkgs/flatpak/flathub/gstreamer-1.0/gstreamer.json.tmp pkgs/flatpak/flathub/gstreamer-1.0/gstreamer.json
     - name: Build
       uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with:
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index b08690772..12320ef98 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -5,16 +5,9 @@
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm18"
+        "org.freedesktop.Sdk.Extension.llvm21"
     ],
     "add-extensions": {
-        "org.freedesktop.Platform.ffmpeg-full": {
-            "version": "24.08",
-            "directory": "lib/ffmpeg",
-            "add-ld-path": ".",
-            "no-autodownload": false,
-            "autodelete": false
-        },
         "com.github.rafostar.Clapper.Enhancers": {
             "versions": "stable;test;master",
             "directory": "extensions/clapper/enhancers",
@@ -43,8 +36,8 @@
         "--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm21/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm21/lib",
         "env": {
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
@@ -79,7 +72,6 @@
         }
     ],
     "cleanup-commands": [
-        "mkdir -p /app/lib/ffmpeg",
         "mkdir -p /app/extensions/clapper/enhancers",
         "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/"
     ]
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json
index 112a499d3..19c590571 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper.json
@@ -1,16 +1,9 @@
 {
     "app-id": "com.github.rafostar.Clapper",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "47",
+    "runtime-version": "49",
     "sdk": "org.gnome.Sdk",
     "add-extensions": {
-        "org.freedesktop.Platform.ffmpeg-full": {
-            "version": "24.08",
-            "directory": "lib/ffmpeg",
-            "add-ld-path": ".",
-            "no-autodownload": false,
-            "autodelete": false
-        },
         "com.github.rafostar.Clapper.Enhancers": {
             "versions": "stable;test;master",
             "directory": "extensions/clapper/enhancers",
@@ -42,12 +35,56 @@
         "flathub/shared-modules/gudev/gudev.json",
         "flathub/lib/liba52.json",
         "flathub/lib/libmpeg2.json",
-        "flathub/lib/libdv.json",
+        {
+            "name": "libdv",
+            "config-opts": [
+                "--enable-shared",
+                "--disable-static"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://downloads.sourceforge.net/libdv/libdv-1.0.0.tar.gz",
+                    "sha256": "a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "cp -fp /usr/share/automake-*/config.{sub,guess} ."
+                    ]
+                },
+                {
+                    "type": "script",
+                    "commands": [
+                        "autoreconf -fiv"
+                    ],
+                    "dest-filename": "autogen.sh"
+                }
+            ]
+        },
         "flathub/lib/libdvdcss.json",
         "flathub/lib/libdvdread.json",
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
-        "flathub/lib/uchardet.json",
+        {
+            "name": "uchardet",
+            "buildsystem": "cmake",
+            "builddir": true,
+            "config-opts": [
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DBUILD_STATIC=OFF",
+                "-DBUILD_BINARY=OFF"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.freedesktop.org/uchardet/uchardet",
+                    "branch": "master",
+                    "commit": "06029ec3340cdf6bf9a6a537dafb3f39eda0560e"
+                }
+            ]
+        },
         "flathub/lib/libmicrodns.json",
         "flathub/lib/libpeas.json",
         "flathub/gstreamer-1.0/gstreamer.json",
@@ -64,7 +101,6 @@
         }
     ],
     "cleanup-commands": [
-        "mkdir -p /app/lib/ffmpeg",
         "mkdir -p /app/extensions/clapper/enhancers",
         "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/"
     ]