From e9862ccd6c81aa6a6e511df1cd046041a35ba637 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Mon, 11 May 2020 14:20:57 +0000
Subject: [PATCH] show_config: move more of show_config kodi specific to distro
 version

Split Kodi configuration messages into hardware / software sections. Hardware is how
other software is being built to accomodate Kodi needs (ie what provides video accel).
Software is the configure options to Kodi.

Kodi version just outputs the velue of $MEDIACENTER, which will always be "kodi".
Change to who the "upstream" is for the version of Kodi we're using is instead.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 config/show_config                       | 17 --------------
 distributions/LibreELEC/config/functions | 30 +++++++++++++++++++-----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/config/show_config b/config/show_config
index e3bfd170f9..4bc7b3f20d 100644
--- a/config/show_config
+++ b/config/show_config
@@ -36,26 +36,9 @@ show_config() {
   fi
   config_message+="\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
   config_message+="\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-
-  # Hardware decoder support
-
-  config_message="$config_message\n\n Hardware decoder configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message+="\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
   config_message+="\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
   config_message+="\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
 
-  # Input device configuration
-
-  config_message+="\n\n Input device configuration:"
-  config_message+="\n $dashes$dashes"
-
-  config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT"
-  config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
-  config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
-  config_message+="\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
-
   # Misc. hardware configuration
 
   config_message+="\n\n Misc. hardware configuration:"
diff --git a/distributions/LibreELEC/config/functions b/distributions/LibreELEC/config/functions
index fdaaf7d0d6..d6eab73b72 100644
--- a/distributions/LibreELEC/config/functions
+++ b/distributions/LibreELEC/config/functions
@@ -1,13 +1,31 @@
 show_distro_config() {
-  # Kodi configuration
-  config_message+="\n\n Kodi configuration:"
+  # Hardware decoder support
+
+  config_message+="\n\n Kodi Hardware configuration:"
   config_message+="\n $dashes$dashes"
 
-  config_message+="\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message+="\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
+  config_message+="\n - Video Acceleration provider:\t\t $KODIPLAYER_DRIVER"
+
+  # Input device configuration
+
+#  config_message+="\n\n Input device configuration:"
+#  config_message+="\n $dashes$dashes"
+
+  config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT"
+  config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
+  config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
+  config_message+="\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+
+  # Kodi configuration
+
+  config_message+="\n\n Kodi Software configuration:"
+  config_message+="\n $dashes$dashes"
+
+  config_message+="\n - Kodi Vendor:\t\t\t\t $KODI_VENDOR"
+  config_message+="\n - Kodi Blu-ray support:\t\t $KODI_BLURAY_SUPPORT"
   if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
-    config_message+="\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
-    config_message+="\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+    config_message+="\n   - Blu-ray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
+    config_message+="\n   - Blu-ray AACS support:\t\t $BLURAY_AACS_SUPPORT"
   fi
   config_message+="\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
   config_message+="\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"