From bbb551f2224a214cbc8e56272a3311fa7256d94f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 18 Jan 2023 05:04:45 +0100 Subject: [PATCH] Try building only the qml gstreamer plugin in flatpak package --- .gitlab-ci.yml | 4 ++++ io.github.NhekoReborn.Nheko.yaml | 33 +++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1130420..ec5cc00d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,6 +172,8 @@ build-flatpak-amd64: - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08 - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08 + # see https://github.com/flatpak/flatpak-builder/issues/495 + - git config --global protocol.file.allow always script: - export VERSION=$(git describe) - mkdir -p build-flatpak @@ -202,6 +204,8 @@ build-flatpak-arm64: - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08 - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08 + # see https://github.com/flatpak/flatpak-builder/issues/495 + - git config --global protocol.file.allow always script: - export VERSION=$(git describe) - if [ "$(grep MemTotal /proc/meminfo | tr -cd '[0-9]')" -lt "6000000" ]; then export EXTRA_FLAGS='--jobs=3'; fi diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index 45dc385b..cbaf6e1c 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -20,14 +20,27 @@ finish-args: - --allow=per-app-dev-shm cleanup: - /include + - /lib/pkgconfig - /bin/mdb* - '*.a' - /libexec - - /lib/cmake/ + - /lib/cmake - /bin/cmark - /bin/event_rpcgen.py - /bin/playout - /bin/secret-tool + - /bin/gst-* + - /share/gdb + - /share/gst* + - /lib/girepository-1.0/ + - /lib/gst-validate-launcher/ + - /lib/gstreamer-1.0/include + - /lib/gstreamer-1.0/include/ + - /lib/gstreamer-1.0/libgstcoreelements.so + - /lib/gstreamer-1.0/libgstopengl* + - /lib/gstreamer-1.0/libgstximagesink.so + - /lib/gstreamer-1.0/validate/ + - /lib/libgst* modules: - name: lmdb sources: @@ -154,6 +167,24 @@ modules: - sha256: f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f type: archive url: https://github.com/google/re2/archive/refs/tags/2022-06-01.tar.gz + - buildsystem: meson + name: gstreamer + sources: + - commit: f7806a854aad960eae3288db4a67a574f92428fe + tag: 1.20.5 + type: git + url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git + config-opts: + - --auto-features=disabled + - -Dgood=enabled + - -Dgst-plugins-good:qt5=enabled + - -Dqt5=enabled + - -Dbase=enabled + - -Dgst-plugins-base:gl=enabled + - -Dgst-plugins-base:gl_platform=glx,egl + - -Dgst-plugins-base:gl_winsys=x11,wayland + - -Dgst-plugins-base:x11=enabled + - -Dgst-plugins-base:xshm=enabled - buildsystem: qmake name: qt-jdenticon no-make-install: true