From 88ba5e202ee30b3973cce4125f9deb5dcfa5306d Mon Sep 17 00:00:00 2001 From: Jakob Gahde Date: Wed, 22 Sep 2021 01:08:59 +0200 Subject: [PATCH] Add Wayland support in AppImages I've been using Wayland as my daily driver for a while now and it seems to work well enough nowadays. --- .github/actions/create-package/create-package.sh | 3 +++ .../actions/install-dependencies/install-dependencies.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/create-package/create-package.sh b/.github/actions/create-package/create-package.sh index 044f469c8..fbd743fa4 100755 --- a/.github/actions/create-package/create-package.sh +++ b/.github/actions/create-package/create-package.sh @@ -30,6 +30,9 @@ create_package_linux() { Pencil2D/usr/share/applications/org.pencil2d.Pencil2D.desktop \ -executable=Pencil2D/usr/plugins/ffmpeg \ ${gst_executables} \ + -extra-plugins=platforms/libqwayland-egl.so,platforms/libqwayland-generic.so,\ +platforms/libqwayland-xcomposite-egl.so,platforms/libqwayland-xcomposite-glx.so,\ +wayland-decoration-client,wayland-graphics-integration-client,wayland-shell-integration \ -appimage mv Pencil2D*.AppImage* "pencil2d-linux-$1-$(date +%F).AppImage" echo "::set-output name=package-name::pencil2d-linux-$1-$(date +%F).AppImage" diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh index 7d46b07b8..6bfb890df 100755 --- a/.github/actions/install-dependencies/install-dependencies.sh +++ b/.github/actions/install-dependencies/install-dependencies.sh @@ -20,10 +20,10 @@ setup_linux() { echo "::group::Install APT packages" apt-get install -yq --no-install-suggests --no-install-recommends \ build-essential qt515tools qt515base qt515multimedia qt515svg \ - qt515xmlpatterns libgl1-mesa-dev bsdtar ffmpeg gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-ugly gstreamer1.0-alsa gstreamer1.0-pulseaudio git \ - curl libfuse2 python3 python3-pip + qt515xmlpatterns qt515wayland libgl1-mesa-dev bsdtar ffmpeg \ + gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-alsa \ + gstreamer1.0-pulseaudio git curl libfuse2 python3 python3-pip echo "::endgroup::" echo "::group::Install Python packages"