diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index e76f0398..0516efcb 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json @@ -14,6 +14,13 @@ "add-ld-path": ".", "no-autodownload": false, "autodelete": false + }, + "com.github.rafostar.Clapper.Enhancers": { + "versions": "master;test;stable", + "directory": "extensions/clapper/enhancers", + "add-ld-path": "lib", + "no-autodownload": false, + "autodelete": false } }, "command": "clapper", @@ -31,7 +38,9 @@ "--filesystem=xdg-run/gvfsd", "--own-name=org.mpris.MediaPlayer2.Clapper.*", "--talk-name=org.gtk.vfs.*", - "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0" + "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0", + "--env=CLAPPER_ENHANCERS_PATH=/app/extensions/clapper/enhancers/plugins", + "--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages" ], "build-options": { "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", @@ -53,11 +62,10 @@ "flathub/lib/libdvdnav.json", "flathub/lib/libass.json", "flathub/lib/libmicrodns.json", + "flathub/lib/libpeas.json", "testing/dav1d.json", "testing/gstreamer.json", "testing/gst-plugins-rs.json", - "testing/yt-dlp.json", - "testing/libpeas.json", { "name": "clapper", "buildsystem": "meson", @@ -67,11 +75,11 @@ "path": "../../." } ] - }, - "testing/clapper-enhancers.json" + } ], "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 d18c46c5..2f7b6c71 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper.json @@ -10,6 +10,13 @@ "add-ld-path": ".", "no-autodownload": false, "autodelete": false + }, + "com.github.rafostar.Clapper.Enhancers": { + "versions": "master;test;stable", + "directory": "extensions/clapper/enhancers", + "add-ld-path": "lib", + "no-autodownload": false, + "autodelete": false } }, "command": "clapper", @@ -27,7 +34,9 @@ "--filesystem=xdg-run/gvfsd", "--own-name=org.mpris.MediaPlayer2.Clapper.*", "--talk-name=org.gtk.vfs.*", - "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0" + "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0", + "--env=CLAPPER_ENHANCERS_PATH=/app/extensions/clapper/enhancers/plugins", + "--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages" ], "modules": [ "flathub/shared-modules/gudev/gudev.json", @@ -40,9 +49,8 @@ "flathub/lib/libass.json", "flathub/lib/uchardet.json", "flathub/lib/libmicrodns.json", - "testing/gstreamer_stable.json", - "testing/yt-dlp.json", - "testing/libpeas.json", + "flathub/lib/libpeas.json", + "flathub/gstreamer-1.0/gstreamer.json", { "name": "clapper", "buildsystem": "meson", @@ -52,11 +60,11 @@ "path": "../../." } ] - }, - "testing/clapper-enhancers.json" + } ], "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/flathub b/pkgs/flatpak/flathub index 49f27907..f58477c3 160000 --- a/pkgs/flatpak/flathub +++ b/pkgs/flatpak/flathub @@ -1 +1 @@ -Subproject commit 49f279076f23e38986869899096d2fa7c9bb4d7d +Subproject commit f58477c35674f49aedc343c25d227f40eecf92f7 diff --git a/pkgs/flatpak/testing/clapper-enhancers.json b/pkgs/flatpak/testing/clapper-enhancers.json deleted file mode 100644 index 2b96e4e7..00000000 --- a/pkgs/flatpak/testing/clapper-enhancers.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "clapper-enhancers", - "buildsystem": "meson", - "config-opts": [ - "-Dauto_features=enabled" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/Rafostar/clapper-enhancers.git", - "branch": "main" - } - ] -} diff --git a/pkgs/flatpak/testing/gstreamer_stable.json b/pkgs/flatpak/testing/gstreamer_stable.json deleted file mode 100644 index a9140864..00000000 --- a/pkgs/flatpak/testing/gstreamer_stable.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "name": "gstreamer", - "buildsystem": "meson", - "config-opts": [ - "--buildtype=release", - "--wrap-mode=nodownload", - - "-Dbase=enabled", - "-Dgood=enabled", - "-Dbad=enabled", - "-Dugly=enabled", - "-Dlibav=enabled", - "-Dvaapi=enabled", - "-Dsharp=disabled", - "-Drs=disabled", - "-Dpython=disabled", - "-Ddevtools=disabled", - "-Dges=disabled", - "-Drtsp_server=disabled", - "-Dgst-examples=disabled", - "-Dqt5=disabled", - "-Dtests=disabled", - "-Dexamples=disabled", - "-Dintrospection=enabled", - "-Ddoc=disabled", - "-Dgtk_doc=disabled", - "-Dgpl=enabled", - - "-Dgstreamer:benchmarks=disabled", - "-Dgstreamer:gobject-cast-checks=disabled", - "-Dgstreamer:glib-asserts=disabled", - "-Dgstreamer:glib-checks=disabled", - "-Dgstreamer:extra-checks=disabled", - - "-Dgst-plugins-base:gobject-cast-checks=disabled", - "-Dgst-plugins-base:glib-asserts=disabled", - "-Dgst-plugins-base:glib-checks=disabled", - "-Dgst-plugins-base:gl_api=opengl,gles2", - "-Dgst-plugins-base:gl_platform=egl,glx", - - "-Dgst-plugins-good:gobject-cast-checks=disabled", - "-Dgst-plugins-good:glib-asserts=disabled", - "-Dgst-plugins-good:glib-checks=disabled", - "-Dgst-plugins-good:gtk3=disabled", - - "-Dgst-plugins-bad:gobject-cast-checks=disabled", - "-Dgst-plugins-bad:glib-asserts=disabled", - "-Dgst-plugins-bad:glib-checks=disabled", - "-Dgst-plugins-bad:extra-checks=disabled", - "-Dgst-plugins-bad:vulkan=disabled", - "-Dgst-plugins-bad:webrtc=disabled", - "-Dgst-plugins-bad:wasapi=disabled", - "-Dgst-plugins-bad:wasapi2=disabled", - "-Dgst-plugins-bad:winks=disabled", - "-Dgst-plugins-bad:winscreencap=disabled", - "-Dgst-plugins-bad:assrender=enabled", - "-Dgst-plugins-bad:nvcodec=enabled", - "-Dgst-plugins-bad:v4l2codecs=enabled", - "-Dgst-plugins-bad:va=enabled", - - "-Dgst-plugins-ugly:gobject-cast-checks=disabled", - "-Dgst-plugins-ugly:glib-asserts=disabled", - "-Dgst-plugins-ugly:glib-checks=disabled", - "-Dgst-plugins-ugly:mpeg2dec=enabled" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git", - "tag": "1.24.9", - "commit": "b309f90bfde36e6d175b70bfa0c941f2829dd6a5", - "disable-submodules": true - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-libav-stop-caching-codecs.patch" - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-plugins-base-autodetect-subtitle-text-encoding.patch" - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-plugins-good-matroska-fix-attachments-detection.patch" - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-plugins-good-dashdemux2-play-last-subfragment.patch" - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-plugins-bad-dashdemux-sidx-range-download.patch" - }, - { - "type": "patch", - "path": "../flathub/gstreamer-1.0/gst-plugins-bad-dashdemux-improve-initial-representation-selection.patch" - } - ] -} diff --git a/pkgs/flatpak/testing/yt-dlp.json b/pkgs/flatpak/testing/yt-dlp.json deleted file mode 100644 index 2b59cb2f..00000000 --- a/pkgs/flatpak/testing/yt-dlp.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "yt-dlp", - "buildsystem": "simple", - "build-commands": [ - "pip3 install -v --root-user-action=ignore --no-deps --prefix=/app *.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/bb/68/548f9819b41d53561d4f3d39588111cf39993c066b6e5300b4ae118eb2e6/yt_dlp-2024.10.22-py3-none-any.whl", - "sha256": "ba166602ebe22a220e4dc1ead45bf00eb469ed812b22f4fb8bb54734f9b02084", - "x-checker-data": { - "type": "pypi", - "name": "yt-dlp", - "packagetype": "bdist_wheel" - } - } - ] -}