From 4268ca27e04f7b7657a0888f0e6571084e5ee97b Mon Sep 17 00:00:00 2001 From: Rafael Gieschke Date: Mon, 18 Nov 2024 19:53:23 +0100 Subject: [PATCH] fixup! moremorewip --- ci/appimage.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/appimage.yml b/ci/appimage.yml index 164a502..429f43d 100644 --- a/ci/appimage.yml +++ b/ci/appimage.yml @@ -61,9 +61,9 @@ build-appimage-job: - meson setup -Dwayland-protocols=enabled -Dbuiltin-mjpeg=false -Dopus=enabled -Dgtk=enabled --prefix=/usr --debug --buildtype=debug spice-gtk/build spice-gtk - ninja -C spice-gtk/build install - - mkdir /home/AppDir - - DESTDIR=/home/AppDir meson setup -Dspice=enabled --prefix=/usr --debug --buildtype=debug build - - DESTDIR=/home/AppDir ninja -C build install + - mkdir /AppDir + - DESTDIR=/AppDir meson setup -Dspice=enabled --prefix=/usr --debug --buildtype=debug build + - DESTDIR=/AppDir ninja -C build install - download() { wget -- "$1"; chmod +x -- "${1##*/}"; } - download https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage @@ -72,16 +72,16 @@ build-appimage-job: # patch both plugins to accept an exclude library env variable - APPEND_TEXT=' --exclude-library "$LINUXDEPLOY_EXCLUDE_LIBRARY"' - - sed -i '/"$LINUXDEPLOY" --appdir "$APPDIR"/s|$|'"$APPEND_TEXT"'|' /home/code/linuxdeploy/squashfs-root/linuxdeploy-plugin-gstreamer.sh - - sed -i '/env LINUXDEPLOY_PLUGIN_MODE=1 "$LINUXDEPLOY" --appdir="$APPDIR" "${LIBRARIES[@]}"/s|$|'"$APPEND_TEXT"'|' /home/code/linuxdeploy/squashfs-root/linuxdeploy-plugin-gtk.sh + - sed -i '/"$LINUXDEPLOY" --appdir "$APPDIR"/s|$|'"$APPEND_TEXT"'|' linuxdeploy-plugin-gstreamer.sh + - sed -i '/env LINUXDEPLOY_PLUGIN_MODE=1 "$LINUXDEPLOY" --appdir="$APPDIR" "${LIBRARIES[@]}"/s|$|'"$APPEND_TEXT"'|' linuxdeploy-plugin-gtk.sh # remove the GDK_BACKEND variable, since it prevents autoscaling on wayland (and it doesn't crash on wayland) - - sed -i '/export GDK_BACKEND=x11 \# Crash with Wayland backend on Wayland/d' /home/code/linuxdeploy/squashfs-root/linuxdeploy-plugin-gtk.sh - - sed -i '/env LINUXDEPLOY_PLUGIN_MODE=1 "$LINUXDEPLOY" --appdir="$APPDIR"/s|\(--appdir="$APPDIR"\)|\1'test'|' /home/code/linuxdeploy/squashfs-root/linuxdeploy-plugin-gtk.sh - - export LINUXDEPLOY_EXCLUDE_LIBRARY="*libva*"; - - ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /home/AppDir/ --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --plugin gtk + - sed -i '/export GDK_BACKEND=x11 \# Crash with Wayland backend on Wayland/d' linuxdeploy-plugin-gtk.sh + - sed -i '/env LINUXDEPLOY_PLUGIN_MODE=1 "$LINUXDEPLOY" --appdir="$APPDIR"/s|\(--appdir="$APPDIR"\)|\1'test'|' linuxdeploy-plugin-gtk.sh + - export LINUXDEPLOY_EXCLUDE_LIBRARY="*libva*" + - ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /AppDir --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --plugin gtk - GSTREAMER_PLUGINS_DIR=/usr/lib64/gstreamer-1.0 GSTREAMER_HELPERS_DIR=/usr/libexec/gstreamer-1.0 GSTREAMER_INCLUDE_BAD_PLUGINS=1 NO_STRIP=1 - ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /home/AppDir/ --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --plugin gstreamer - - ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /home/AppDir/ --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --output appimage + ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /AppDir --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --plugin gstreamer + - ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir /AppDir --exclude-library ${LINUXDEPLOY_EXCLUDE_LIBRARY} --output appimage artifacts: paths: