From 75cd812fa3a0d6e6909cefc534b3c44885b3e7e0 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 2 Jan 2018 23:53:21 +0100 Subject: [PATCH] postmarketos-ui-plasma-mobile: use kwin with framebuffer when missing /dev/dri (#1062) Modified Plasma launch script to (crudely and unreliably) detect if it has to run on the framebuffer or not --- main/postmarketos-ui-plasma-mobile/APKBUILD | 4 ++-- main/postmarketos-ui-plasma-mobile/start_plasma.sh | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 9661c8623..e77c87cab 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-ui-plasma-mobile pkgver=1 -pkgrel=8 +pkgrel=9 pkgdesc="(Wayland) Mobile variant of KDE Plasma, optimized for touchscreen" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch" @@ -26,6 +26,6 @@ package() { install -D -m644 "$srcdir"/qtlogging.ini \ "$pkgdir"/etc/skel/.config/QtProject/qtlogging.ini } -sha512sums="535b0378767c4c55974f15314f128b421879606094c681db0f9230552d9da83bedc2ba3143368c973259ba5f7025ccdde38c80c558828e3f53f6c5ae26227fef start_plasma.sh +sha512sums="863ea3801b5f045891c511788980be7d2da8fb673038367725a15d6ae17b990e333d4655f4f418516e1cd8be37c2e4fa66e1b147b7266a6a290569a8d67ea368 start_plasma.sh a95d3bbd1e8051c9b394ad7a26e4beb2d1be8d3c38189819da61fd42b1c7fd3948c4737bc9246eee23eaf5fd9451cd6362fb06442f3d8f967f930d3bcc5cfbe9 kwinrc 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini" diff --git a/main/postmarketos-ui-plasma-mobile/start_plasma.sh b/main/postmarketos-ui-plasma-mobile/start_plasma.sh index 5eb9999d9..b743bce15 100644 --- a/main/postmarketos-ui-plasma-mobile/start_plasma.sh +++ b/main/postmarketos-ui-plasma-mobile/start_plasma.sh @@ -12,6 +12,12 @@ if test -z "${XDG_RUNTIME_DIR}"; then export QML2_IMPORT_PATH=/usr/lib/qt/qml:/usr/lib/qt5/qml sleep 2 - ck-launch-session kwin_wayland --drm --xwayland -- plasma-phone 2>&1 | logger -t "$(whoami):plasma-mobile" + + if [ -d "/dev/dri" ]; then + ck-launch-session kwin_wayland --drm --xwayland plasma-phone 2>&1 | logger -t "$(whoami):plasma-mobile" + else + export KWIN_COMPOSE=Q + ck-launch-session kwin_wayland --framebuffer --xwayland plasma-phone 2>&1 | logger -t "$(whoami):plasma-mobile" + fi fi fi