From d013fd45236ba263633b6e258aa4a93b55d3e47d Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Mon, 25 Mar 2024 20:14:01 -0700
Subject: [PATCH] Refactor eglfs config for RPi compat (relates to #22)

---
 overlays/29-ovos-shell/etc/neon/eglfs.json     | 2 +-
 overlays/29-ovos-shell/etc/neon/gui-shell.conf | 1 -
 recipes/29-ovos-shell.yml                      | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/overlays/29-ovos-shell/etc/neon/eglfs.json b/overlays/29-ovos-shell/etc/neon/eglfs.json
index d8af21aa..25ab48e6 100644
--- a/overlays/29-ovos-shell/etc/neon/eglfs.json
+++ b/overlays/29-ovos-shell/etc/neon/eglfs.json
@@ -1 +1 @@
-{ "device": "/dev/dri/card1" }
\ No newline at end of file
+{ "device": "/dev/dri/card0" }
\ No newline at end of file
diff --git a/overlays/29-ovos-shell/etc/neon/gui-shell.conf b/overlays/29-ovos-shell/etc/neon/gui-shell.conf
index 6faec087..3b593eb1 100644
--- a/overlays/29-ovos-shell/etc/neon/gui-shell.conf
+++ b/overlays/29-ovos-shell/etc/neon/gui-shell.conf
@@ -1,7 +1,6 @@
 QT_IM_MODULE=qtvirtualkeyboard
 QT_QPA_PLATFORM=eglfs
 QT_QPA_EGLFS_KMS_ATOMIC=1
-QT_QPA_EGLFS_KMS_CONFIG=/etc/neon/eglfs.json
 QT_QPA_PLATFORMTHEME=qt5ct
 QT_PLUGIN_PATH=/usr/lib/aarch64-linux-gnu/qt5/plugins:/usr/lib/aarch64-linux-gnu/qt5/plugins/kf5
 QT_QUICK_CONTROLS_CONF=/home/neon/.config/qtquickcontrols2material.conf
diff --git a/recipes/29-ovos-shell.yml b/recipes/29-ovos-shell.yml
index f3acd3d3..cd87e2f1 100755
--- a/recipes/29-ovos-shell.yml
+++ b/recipes/29-ovos-shell.yml
@@ -67,8 +67,7 @@ actions:
   - action: run
     description: Patch device path for Orange Pi5
     chroot: True
-    command: |
-      sed -i -e "s|card1|card0|g" /etc/neon/eglfs.json
+    command: echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/neon/eglfs.json" >> /etc/neon/gui-shell.conf
 {{ end }}
 
   - action: run