From 8ac839c9aafc92e25e90a64ee3af2779eb2366aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Thu, 10 Mar 2022 10:28:04 +0100 Subject: [PATCH 1/4] flatpak-nightly: Disable cloning GStreamer submodules It seems that now GStreamer ships its testsuite (which we do not need) as a submodule. Do not try to clone it. --- pkgs/flatpak/testing/gstreamer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/flatpak/testing/gstreamer.json b/pkgs/flatpak/testing/gstreamer.json index 6daf1583..d518e01e 100644 --- a/pkgs/flatpak/testing/gstreamer.json +++ b/pkgs/flatpak/testing/gstreamer.json @@ -66,7 +66,8 @@ { "type": "git", "url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git", - "branch": "main" + "branch": "main", + "disable-submodules": true } ] } From 8ce977505e1dd3f4a6f399b9ec285f9ae894713c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Thu, 10 Mar 2022 20:51:45 +0100 Subject: [PATCH 2/4] actions: nightly: Manually install SDK extensions via workflow The github actions Flatpak action only allows to specify single source for installing missing dependencies. This makes impossible to build some things from "gnome-nightly" while others from "flathub" repo. Work around this limitation by manually installing missing SDK extensions from Flathub prior to using this git action. --- .github/workflows/flatpak-nightly.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index 3d08c5a4..f81a29b5 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -26,8 +26,12 @@ jobs: uses: docker/setup-qemu-action@v1 with: platforms: arm64 + - name: Prepare Runtime + run: | + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-nightly/${{ matrix.arch }}/21.08 + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm13/${{ matrix.arch }}/21.08 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 - name: "Build" + name: Build with: bundle: com.github.rafostar.Clapper.flatpak manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-nightly.json From 9f182957284a6f2c34e9b5b761a7691be41a8047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Thu, 10 Mar 2022 22:20:16 +0100 Subject: [PATCH 3/4] flatpak-nightly: Do not disable GStreamer asserts and checks We may disable them for stable releases, but should be left to default on nightly --- pkgs/flatpak/testing/gstreamer.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/flatpak/testing/gstreamer.json b/pkgs/flatpak/testing/gstreamer.json index d518e01e..5ae2cb22 100644 --- a/pkgs/flatpak/testing/gstreamer.json +++ b/pkgs/flatpak/testing/gstreamer.json @@ -26,26 +26,12 @@ "-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", @@ -57,9 +43,6 @@ "-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": [ From e0daf8435a6e4a302c856aeac2e301a01eba8080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Thu, 10 Mar 2022 22:22:00 +0100 Subject: [PATCH 4/4] flatpak-nightly: Use "--wrap-mode=nodownload" for GStreamer build We do not have net access during build of GStreamer, nor we want to pull anything, so disable downloads so it will not try --- pkgs/flatpak/testing/gstreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/flatpak/testing/gstreamer.json b/pkgs/flatpak/testing/gstreamer.json index 5ae2cb22..ae475666 100644 --- a/pkgs/flatpak/testing/gstreamer.json +++ b/pkgs/flatpak/testing/gstreamer.json @@ -2,7 +2,7 @@ "name": "gstreamer", "buildsystem": "meson", "config-opts": [ - "--wrap-mode=nofallback", + "--wrap-mode=nodownload", "-Dbase=enabled", "-Dgood=enabled",