From f449b54f87548d86609ca7ffb55b6ccf5df4ba47 Mon Sep 17 00:00:00 2001 From: GovanifY Date: Thu, 20 Feb 2025 23:06:26 +0100 Subject: [PATCH] CI: enable wayland by default --- .github/workflows/scripts/linux/appimage-qt.sh | 11 ----------- .../scripts/linux/apprun-hooks/default-to-x11.sh | 9 --------- .../scripts/linux/flatpak/net.pcsx2.PCSX2.json | 6 +++--- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/scripts/linux/apprun-hooks/default-to-x11.sh diff --git a/.github/workflows/scripts/linux/appimage-qt.sh b/.github/workflows/scripts/linux/appimage-qt.sh index 2400954987..ed39581120 100755 --- a/.github/workflows/scripts/linux/appimage-qt.sh +++ b/.github/workflows/scripts/linux/appimage-qt.sh @@ -187,17 +187,6 @@ echo "Generating AppStream metainfo..." mkdir -p "$OUTDIR/usr/share/metainfo" "$SCRIPTDIR/generate-metainfo.sh" "$OUTDIR/usr/share/metainfo/net.pcsx2.PCSX2.appdata.xml" -# Copy in AppRun hooks. -# Unfortunately linuxdeploy is a bit lame and doesn't let us provide our own AppRun hooks, instead -# they have to come from plugins.. and screw writing one of those just to disable Wayland. -echo "Copying AppRun hooks..." -mkdir -p "$OUTDIR/apprun-hooks" -for hookpath in "$SCRIPTDIR/apprun-hooks"/*; do - hookname=$(basename "$hookpath") - cp -v "$hookpath" "$OUTDIR/apprun-hooks/$hookname" - sed -i -e 's/exec /source "$this_dir"\/apprun-hooks\/"'"$hookname"'"\nexec /' "$OUTDIR/AppRun" -done - echo "Generating AppImage..." GIT_VERSION=$(git tag --points-at HEAD) diff --git a/.github/workflows/scripts/linux/apprun-hooks/default-to-x11.sh b/.github/workflows/scripts/linux/apprun-hooks/default-to-x11.sh deleted file mode 100644 index 16ee82f12a..0000000000 --- a/.github/workflows/scripts/linux/apprun-hooks/default-to-x11.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [[ -z "$I_WANT_A_BROKEN_WAYLAND_UI" ]]; then - echo "Forcing X11 instead of Wayland, due to various protocol limitations" - echo "and Qt issues. If you want to use Wayland, launch PCSX2 with" - echo "I_WANT_A_BROKEN_WAYLAND_UI=YES set." - export QT_QPA_PLATFORM=xcb -else - echo "Wayland is not being disabled. Do not complain when things break." -fi - diff --git a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json index 64b427de0d..f37615e883 100644 --- a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json +++ b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json @@ -19,10 +19,10 @@ "--device=all", "--share=network", "--share=ipc", - "--socket=x11", + "--socket=wayland", + "--socket=fallback-x11", "--socket=pulseaudio", - "--talk-name=org.freedesktop.ScreenSaver", - "--env=QT_QPA_PLATFORM=xcb" + "--talk-name=org.freedesktop.ScreenSaver" ], "modules": [ "modules/10-libpcap.json",