From 13fbb3e50112c26b36f968514c1cf0916fd20ab0 Mon Sep 17 00:00:00 2001 From: clayton craft Date: Wed, 7 Oct 2020 22:24:00 -0700 Subject: [PATCH] main/postmarketos-mkinitfs: set no_supertile for osk with mesa (MR 1625) This is needed by the librem 5, else the graphics are distorted/unusable. --- main/postmarketos-mkinitfs/APKBUILD | 4 ++-- main/postmarketos-mkinitfs/init_functions.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 318f0251f..028dd7dfb 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Oliver Smith pkgname=postmarketos-mkinitfs -pkgver=0.15.0 +pkgver=0.15.1 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" @@ -55,7 +55,7 @@ check() { sha512sums="5037cb7285bb7c0c40ca9e6df332d882ef9a8b379756c785f921e062dab1b7e7f3139d00897f69323a916d709ced4297fea8cbd3a13ebae575b873ec9e2cbfae 00-default.modules 7fc6ba96419628850984df3322b73bcf655cba03fe3e97ec7425e66e90f4b2a4de106b5cb2e3d46785a92557334288011334104285e2050c7a8e823b8fa5668c init.sh.in -ce30c06d36c425668fd84a192b1c03162fca937b0c1d170247380309309bf486021a539cb70b2ebe96cb1a7ae4090dbdf55401970ee0f1140cb327b7e74ddd30 init_functions.sh +c1d9ebca17e071e43c103dd21868d3ca77aaa03aac9806f15140163ed80172f17da2f93462cd9b295b65114406e32a24a6f3b4451a237a509f9c69b38ec3612e init_functions.sh dfc01ee0547ea88b7aa45a005e842b636e9e19bbf1705f3dad53a66d57af7c5c513c092b5469a06d9b00322e56a4d25f1b47e4c5324aafa99f5291679968d1f1 mkinitfs.sh 874b1bba86085a4b7707b3d1ac6534e2027b5783111b2f9c66c2595ada95113a95272c1be9d234b7957c785978de0c5352b4abd70819871caed9efcfbf703dac mkinitfs_functions.sh c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh" diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 19044db20..b32a41636 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -458,12 +458,15 @@ start_onscreen_keyboard() { # shellcheck disable=SC2154 if [ -n "$deviceinfo_mesa_driver" ]; then export SDL_VIDEODRIVER="kmsdrm" + # needed for librem 5 + export ETNA_MESA_DEBUG="no_supertile" else setup_directfb_tslib fi osk-sdl -n root -d "$partition" -c /etc/osk.conf -v > /osk-sdl.log 2>&1 + unset ETNA_MESA_DEBUG unset SDL_VIDEODRIVER unset DFBARGS unset TSLIB_TSDEVICE