From c05b4a1815120051bfbdca49bf2749ca554a0ac7 Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Mon, 17 Aug 2020 00:49:15 -0600
Subject: [PATCH] Hardware video acceleration, minor improvements

Added back fbdev and fbturbo, because why not?

Changed package names to Debian's instead of Raspbian's

Nginx config question now defaults to no since most people don't do
that

Nginx is now disabled on first boot since it just failed anyways
---
 stage2/04-octoprint/01-run.sh             | 2 ++
 stage2/05-mjpgstreamer/00-packages        | 2 +-
 stage2/06-utils/files/first-time.sh       | 2 +-
 stage3/00-install-packages/00-packages-nr | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/stage2/04-octoprint/01-run.sh b/stage2/04-octoprint/01-run.sh
index ae23e9c..556c36a 100755
--- a/stage2/04-octoprint/01-run.sh
+++ b/stage2/04-octoprint/01-run.sh
@@ -6,6 +6,8 @@ install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf
 echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.conf
 
 on_chroot << EOF
+# Package enables this when installed, won't start until first-time is run due to missing SSL certs
+systemctl disable nginx 
 # If OctoPrint already exists, skip this (for debugging)
 if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
   cd /srv/ || exit 1
diff --git a/stage2/05-mjpgstreamer/00-packages b/stage2/05-mjpgstreamer/00-packages
index f62499f..c8d5ba7 100644
--- a/stage2/05-mjpgstreamer/00-packages
+++ b/stage2/05-mjpgstreamer/00-packages
@@ -1,5 +1,5 @@
 cmake
-libjpeg8-dev
+libjpeg-dev
 v4l-utils
 libv4l-dev
 gcc
diff --git a/stage2/06-utils/files/first-time.sh b/stage2/06-utils/files/first-time.sh
index c4770f7..aef640d 100755
--- a/stage2/06-utils/files/first-time.sh
+++ b/stage2/06-utils/files/first-time.sh
@@ -84,7 +84,7 @@ screen_timeout
 openssl req -x509 -nodes -days 36500 -newkey rsa:4096 -subj "/C=/ST=/L=/O=/OU=/CN=*/emailAddress=" -out /etc/ssl/certs/nginx-octoprint.crt -keyout /etc/ssl/private/nginx-octoprint.key
 
 # If OctoPrint/MJPG Streamer is running locally, ask if the user wants to change the default listening port/IP (optional)
-if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
+if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --defaultno --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
   nginx_config
 fi
 
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
index a239b02..d0ba597 100644
--- a/stage3/00-install-packages/00-packages-nr
+++ b/stage3/00-install-packages/00-packages-nr
@@ -1,9 +1,11 @@
 xserver-xorg
+xserver-xorg-video-fbdev
+xserver-xorg-video-fbturbo
 xinit
 menu-xdg
 zenity
 xdg-utils
 gvfs-backends
 gvfs-fuse
-gnome-themes-standard-data
+gnome-themes-standard
 gnome-icon-theme