From 1f62130e41313bc78c51d67344b3c22b74ee0616 Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Fri, 10 Oct 2025 19:13:19 +0300 Subject: [PATCH 01/10] flatpak: remove ffmpeg-full and bump llvm --- .../com.github.rafostar.Clapper-nightly.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index b08690772..b2b5e5bcd 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", From 0f0a0a0cd2108f157df700e46ef972035d6c834f Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Fri, 10 Oct 2025 19:18:11 +0300 Subject: [PATCH 02/10] flatpak: bump stable manifest too --- pkgs/flatpak/com.github.rafostar.Clapper-nightly.json | 1 - pkgs/flatpak/com.github.rafostar.Clapper.json | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index b2b5e5bcd..12320ef98 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json @@ -72,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..91165ab57 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", @@ -64,7 +57,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/" ] From c573d8617798358be9beb7ef2c5eb894b339fa5e Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Fri, 10 Oct 2025 19:20:53 +0300 Subject: [PATCH 03/10] ci: fix flatpak deps --- .github/workflows/flatpak-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 2be27488682cc3af6af6e62fa4273b85782fb3bd Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Fri, 10 Oct 2025 22:22:24 +0300 Subject: [PATCH 04/10] flatpak: bundle libdv here --- pkgs/flatpak/com.github.rafostar.Clapper.json | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json index 91165ab57..6e97550cb 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper.json @@ -35,7 +35,39 @@ "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": "file", + "url": "https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=a2287c3041a3f2a204eb942e09c015eab00dc7dd", + "sha256": "50205cf3ec5c7615b17f937a0a57babf4ec5cd0aade3d7b3cccbe5f1bf91a7ef", + "dest-filename": "config.guess" + }, + { + "type": "file", + "url": "https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=a2287c3041a3f2a204eb942e09c015eab00dc7dd", + "sha256": "26b852f75a637448360a956931439f7e818bf63150eaadb9b85484347628d1fd", + "dest-filename": "config.sub" + }, + { + "type": "script", + "commands": [ + "autoreconf -fiv" + ], + "dest-filename": "autogen.sh" + } + ] + }, "flathub/lib/libdvdcss.json", "flathub/lib/libdvdread.json", "flathub/lib/libdvdnav.json", From 1526cfec1526f9c8990b7aab377cf33e2d096a8c Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Fri, 10 Oct 2025 22:31:35 +0300 Subject: [PATCH 05/10] flatpak: bundle uchardet here --- pkgs/flatpak/com.github.rafostar.Clapper.json | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json index 6e97550cb..e4b120247 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper.json @@ -72,7 +72,25 @@ "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", @@ -92,4 +110,4 @@ "mkdir -p /app/extensions/clapper/enhancers", "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/" ] -} +} \ No newline at end of file From eedc80491a508a529339fea42bd3c8786f2f015b Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Sat, 11 Oct 2025 20:07:58 +0300 Subject: [PATCH 06/10] flatpak: use gnu-config from automake for libdv --- pkgs/flatpak/com.github.rafostar.Clapper.json | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json index e4b120247..19c590571 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper.json @@ -48,16 +48,10 @@ "sha256": "a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba" }, { - "type": "file", - "url": "https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=a2287c3041a3f2a204eb942e09c015eab00dc7dd", - "sha256": "50205cf3ec5c7615b17f937a0a57babf4ec5cd0aade3d7b3cccbe5f1bf91a7ef", - "dest-filename": "config.guess" - }, - { - "type": "file", - "url": "https://cgit.git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=a2287c3041a3f2a204eb942e09c015eab00dc7dd", - "sha256": "26b852f75a637448360a956931439f7e818bf63150eaadb9b85484347628d1fd", - "dest-filename": "config.sub" + "type": "shell", + "commands": [ + "cp -fp /usr/share/automake-*/config.{sub,guess} ." + ] }, { "type": "script", @@ -110,4 +104,4 @@ "mkdir -p /app/extensions/clapper/enhancers", "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/" ] -} \ No newline at end of file +} From 713e27e8ff81532d0fbc63ef18b7f09bc0257aa2 Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Sat, 11 Oct 2025 20:08:30 +0300 Subject: [PATCH 07/10] ci: remove gstreamer libav patch --- .github/workflows/flatpak.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 36a8c2fc6..1d2294fd9 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -33,6 +33,8 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive + - name: Remove gstreamer ffmpeg-full patch + run: jq 'del(.sources[] | select(.path == "gst-libav-stop-caching-codecs.patch"))' > pkgs/flatpak/flathub/gstreamer-1.0/gst-libav-stop-caching-codecs.patch - name: Build uses: flatpak/flatpak-github-actions/flatpak-builder@master with: From 75b1402ef4c29f4a639db893bc3094b5a509b95b Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Sat, 11 Oct 2025 20:11:59 +0300 Subject: [PATCH 08/10] ci: install jq --- .github/workflows/flatpak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 1d2294fd9..431702e27 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -26,7 +26,7 @@ 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 From 32b3df20ba933c1e6906279d21988241aa332878 Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Sat, 11 Oct 2025 20:18:16 +0300 Subject: [PATCH 09/10] ci: actually read and replace the gstreamer manifest let's pretend I didn't push the previous version --- .github/workflows/flatpak.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 431702e27..e21bf2bd8 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -34,7 +34,9 @@ jobs: with: submodules: recursive - name: Remove gstreamer ffmpeg-full patch - run: jq 'del(.sources[] | select(.path == "gst-libav-stop-caching-codecs.patch"))' > pkgs/flatpak/flathub/gstreamer-1.0/gst-libav-stop-caching-codecs.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 - name: Build uses: flatpak/flatpak-github-actions/flatpak-builder@master with: From f9f9687267c74ba89d8c86329b4c1755dfe8c0ab Mon Sep 17 00:00:00 2001 From: Evan Paterakis Date: Sat, 11 Oct 2025 20:27:15 +0300 Subject: [PATCH 10/10] ci: properly overwrite the jq input --- .github/workflows/flatpak.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index e21bf2bd8..a22688261 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -36,7 +36,8 @@ jobs: - 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 + 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: