From 0e30c6f760cf1b1a28c1684b62dcaa640262102e Mon Sep 17 00:00:00 2001
From: clayton craft <clayton@craftyguy.net>
Date: Wed, 28 Oct 2020 15:57:27 -0700
Subject: [PATCH] postmarketos-mkinitfs: fallback to directfb if osk-sdl fails
 w/ mesa (1625) (MR 1625)

---
 main/postmarketos-mkinitfs/APKBUILD          |  4 ++--
 main/postmarketos-mkinitfs/init_functions.sh | 21 ++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index 028dd7dfb..96c014f52 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-mkinitfs
-pkgver=0.15.1
+pkgver=0.16
 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
-c1d9ebca17e071e43c103dd21868d3ca77aaa03aac9806f15140163ed80172f17da2f93462cd9b295b65114406e32a24a6f3b4451a237a509f9c69b38ec3612e  init_functions.sh
+2273bbda86954bd1b424ac55cb7d8d04e7fb19f318caad5f5cdfaa996681f04de788be83b02cabda7b6d07dabd44ff71be5c11f3969ba5f7fe4d8f95a2de8b4c  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 b32a41636..4199f012a 100644
--- a/main/postmarketos-mkinitfs/init_functions.sh
+++ b/main/postmarketos-mkinitfs/init_functions.sh
@@ -448,23 +448,36 @@ setup_directfb_tslib() {
 	# Note: linux_input module is disabled since it will try to take over
 	# the touchscreen device from tslib (e.g. on the N900)
 	export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input"
+	export SDL_VIDEODRIVER="directfb"
 	# shellcheck disable=SC2154
 	if [ -n "$deviceinfo_dev_touchscreen" ]; then
 		export TSLIB_TSDEVICE="$deviceinfo_dev_touchscreen"
 	fi
 }
 
+setup_kmsdrm() {
+	# Set up SDL and Mesa env to use kmsdrm backend
+	export SDL_VIDEODRIVER="kmsdrm"
+	# needed for librem 5
+	export ETNA_MESA_DEBUG="no_supertile"
+}
+
+run_osk_sdl() {
+	osk-sdl -n root -d "$partition" -c /etc/osk.conf -v > /osk-sdl.log 2>&1
+}
+
 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"
+		setup_kmsdrm
 	else
 		setup_directfb_tslib
 	fi
 
-	osk-sdl -n root -d "$partition" -c /etc/osk.conf -v > /osk-sdl.log 2>&1
+	if ! run_osk_sdl; then
+		setup_directfb_tslib
+		run_osk_sdl
+	fi
 
 	unset ETNA_MESA_DEBUG
 	unset SDL_VIDEODRIVER