From 6ed9f699acbe1278753d6d7267db903c4b452a35 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 10 Jan 2016 14:03:37 +0100
Subject: Fixes for SDDM and X keyboard mapping.

---
 make_slackware_live.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index c8018dc..bcf8011 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1091,6 +1091,21 @@ KRES_EOF
 alreadyMigrated=true
 KWALLET_EOL
 
+  # Make sure that Plasma and SDDM work on older GPUs,
+  # by forcing Qt5 to use software GL rendering:
+  cat <<"EOGL" >> ${LIVE_ROOTDIR}/usr/share/sddm/scripts/Xsetup
+
+OPENGL_VERSION=$(LANG=C glxinfo |grep '^OpenGL version string: ' |head -n 1 |sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g')
+if [ "$OPENGL_VERSION" -lt 2 ]; then
+  QT_XCB_FORCE_SOFTWARE_OPENGL=1
+  export QT_XCB_FORCE_SOFTWARE_OPENGL
+fi
+
+EOGL
+
+  # Workaround a bug where SDDM does not always use the configured keymap:
+  echo "setxkbmap" >> ${LIVE_ROOTDIR}/usr/share/sddm/scripts/Xsetup
+
 fi # End LIVEDE = PLASMA5
 
 # Give the live user a copy of our skeleton configuration:
@@ -1098,6 +1113,9 @@ cd ${LIVE_ROOTDIR}/etc/skel/
   find . -exec cp -a --parents "{}" ${LIVE_ROOTDIR}/home/live/ \;
 cd - 1>/dev/null
 
+# Workaround a bug where our Xkbconfig is not loaded sometimes:
+echo "setxkbmap" > ${LIVE_ROOTDIR}/home/live/.xprofile
+
 # Make sure that user 'live' owns her own files:
 chroot ${LIVE_ROOTDIR} chown -R live:users home/live
 
-- 
cgit v1.2.3