From 785e46b9c0ed66bcb4529270ddceb175604aeb8f Mon Sep 17 00:00:00 2001 From: muelli Date: Fri, 14 Nov 2025 06:20:26 +0100 Subject: [PATCH 1/6] Bump runtime to 49 --- com.github.KRTirtho.Spotube.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.github.KRTirtho.Spotube.yml b/com.github.KRTirtho.Spotube.yml index c1412c4..a6d6db9 100644 --- a/com.github.KRTirtho.Spotube.yml +++ b/com.github.KRTirtho.Spotube.yml @@ -1,12 +1,12 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json app-id: com.github.KRTirtho.Spotube runtime: org.gnome.Platform -runtime-version: "48" +runtime-version: "49" sdk: org.gnome.Sdk command: spotube add-extensions: org.freedesktop.Platform.ffmpeg-full: - version: '24.08' + version: '25.08' directory: lib/ffmpeg add-ld-path: . cleanup-commands: From 126eb4caaa14c9c00906847f33df4ec2f78812cf Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Sun, 4 Jan 2026 17:45:42 -0800 Subject: [PATCH 2/6] shared module: updated to latest master --- shared-modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-modules b/shared-modules index 2743615..137a4f4 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 274361549c3af53aff26d56df26bd7b77fa4f5e4 +Subproject commit 137a4f488c7fc4cca531a379076f78a8e6f7c22d From 8ba15b7d64d5d8febf4540f84c5890f2608396d4 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Mon, 5 Jan 2026 06:56:13 -0800 Subject: [PATCH 3/6] drop libsecret It's probably in the runtime: https://github.com/flathub/shared-modules/issues/424 --- com.github.KRTirtho.Spotube.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/com.github.KRTirtho.Spotube.yml b/com.github.KRTirtho.Spotube.yml index a39bb04..4c91bfd 100644 --- a/com.github.KRTirtho.Spotube.yml +++ b/com.github.KRTirtho.Spotube.yml @@ -29,7 +29,6 @@ finish-args: - --own-name=org.mpris.MediaPlayer2.spotube.* modules: - shared-modules/libappindicator/libappindicator-gtk3-12.10.json - - shared-modules/libsecret/libsecret.json - name: libnotify buildsystem: meson config-opts: From 8e06366b871077ba9c079f437a076513cdabbcef Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Mon, 5 Jan 2026 07:04:21 -0800 Subject: [PATCH 4/6] bump libplacebo hoping for it to build [15/73] Generating src/vulkan/utils_gen.c with a custom command (wrapped by meson to set env) FAILED: [code=1] src/vulkan/utils_gen.c /usr/bin/meson --internal exe --unpickle /run/build/libplacebo/_flatpak_build/meson-private/meson_exe_python3_4cf9aac460ddf4b9042d1eca3acade1c26a859d1.dat while executing ['/usr/bin/python', '../src/vulkan/utils_gen.py', '/app/share', '', 'src/vulkan/utils_gen.c'] --- stdout --- Found vk.xml: /usr/share/vulkan/registry/vk.xml --- stderr --- Traceback (most recent call last): File "/run/build/libplacebo/_flatpak_build/../src/vulkan/utils_gen.py", line 205, in registry = VkXML(ET.parse(xmlfile)) File "/run/build/libplacebo/_flatpak_build/../src/vulkan/utils_gen.py", line 50, in __init__ super().__init__(*args, **kwargs) ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.13/xml/etree/ElementTree.py", line 527, in __init__ raise TypeError('expected an Element, not %s' % type(element).__name__) TypeError: expected an Element, not ElementTree [16/73] Generating src/opengl/include/glad/gl.h with a custom command (wrapped by meson to set env) ninja: build stopped: subcommand failed. Error: module libplacebo: Child process exited with code 1 --- com.github.KRTirtho.Spotube.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.github.KRTirtho.Spotube.yml b/com.github.KRTirtho.Spotube.yml index 4c91bfd..3746c3a 100644 --- a/com.github.KRTirtho.Spotube.yml +++ b/com.github.KRTirtho.Spotube.yml @@ -98,8 +98,8 @@ modules: - -Ddemos=False sources: - type: archive - url: https://code.videolan.org/videolan/libplacebo/-/archive/v7.349.0/libplacebo-v7.349.0.tar.gz - sha256: 79120e685a1836344b51b13b6a5661622486a84e4d4a35f6c8d01679a20fbc86 + url: https://code.videolan.org/videolan/libplacebo/-/archive/v7.351.0/libplacebo-v7.351.0.tar.gz + sha256: 4efe1c8d4da3c61295eb5fdfa50e6037409d8425eb3c15dd86788679c4ce59ee x-checker-data: type: anitya project-id: 20101 From 296fa901634c163a22f6b39ecbe2cac30f945df9 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Mon, 5 Jan 2026 09:42:57 -0800 Subject: [PATCH 5/6] libplacebo: Patch to make it build https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17 --- ...9c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch | 31 +++++++++++++++++++ com.github.KRTirtho.Spotube.yml | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch diff --git a/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch b/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch new file mode 100644 index 0000000..cd5eec3 --- /dev/null +++ b/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch @@ -0,0 +1,31 @@ +From 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Tue, 29 Jul 2025 11:42:35 +0200 +Subject: [PATCH] vulkan/utils_gen: fix for python 3.14 + +Python 3.14+ has added more type checking. This patch fixes usage + +Fixes: https://github.com/haasn/libplacebo/issues/335 + +Signed-off-by: Nicolas Chauvet +--- + src/vulkan/utils_gen.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py +index 9a97d35f3..9b803d82b 100644 +--- a/src/vulkan/utils_gen.py ++++ b/src/vulkan/utils_gen.py +@@ -202,7 +202,8 @@ if __name__ == '__main__': + if not xmlfile or xmlfile == '': + xmlfile = find_registry_xml(datadir) + +- registry = VkXML(ET.parse(xmlfile)) ++ tree = ET.parse(xmlfile) ++ registry = VkXML(tree.getroot()) + with open(outfile, 'w') as f: + f.write(TEMPLATE.render( + vkresults = get_vkenum(registry, 'VkResult'), +-- +GitLab + diff --git a/com.github.KRTirtho.Spotube.yml b/com.github.KRTirtho.Spotube.yml index 3746c3a..4a6f56d 100644 --- a/com.github.KRTirtho.Spotube.yml +++ b/com.github.KRTirtho.Spotube.yml @@ -121,6 +121,8 @@ modules: type: anitya project-id: 300234 url-template: https://github.com/Dav1dde/glad/archive/refs/tags/v$version.tar.gz + - type: patch + path: 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch - name: libass config-opts: From b519c47c4080b78be871df32088e0f57f112aae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sun, 18 Jan 2026 16:35:32 +0300 Subject: [PATCH 6/6] Drop ffmpeg extension Freedesktop runtime version 25.08 (also GNOME runtime 49, KDE runtime 6.10, and 5.15-25.08) provides FFMPEG; therefore, declaring **org.freedesktop.Platform.ffmpeg-full** extension is no longer required. > in the manifest. org.freedesktop.Platform.codecs-extra will be automatically installed by the runtime and will be available to users. More information - https://bbhtt.in/posts/closing-the-chapter-on-openh264/ - https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/1825 - https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/931 --- com.github.KRTirtho.Spotube.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/com.github.KRTirtho.Spotube.yml b/com.github.KRTirtho.Spotube.yml index 4a6f56d..9ada64c 100644 --- a/com.github.KRTirtho.Spotube.yml +++ b/com.github.KRTirtho.Spotube.yml @@ -4,13 +4,6 @@ runtime: org.gnome.Platform runtime-version: "49" sdk: org.gnome.Sdk command: spotube -add-extensions: - org.freedesktop.Platform.ffmpeg-full: - version: '25.08' - directory: lib/ffmpeg - add-ld-path: . -cleanup-commands: - - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg finish-args: - --socket=fallback-x11 - --socket=wayland