Merge pull request #1699 from JustEnoughLinuxOS/dev

PR to main - fix ES bug.

packages/jelos/profile.d/02-distribution

@@ -24,19 +24,35 @@ get_setting() {
       return
     else
       ### If not, check to see if we have a system setting.
-      awk -F: '/^'"${2}.${1}"'=/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF}
+      LOCAL=$(awk -F: '/^'"${2}.${1}"'=/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
+      if [ ! -z "${LOCAL}" ]
+      then
+        echo ${LOCAL}
+        return
+      fi
+    fi
+  fi
+
+  if [ -z "${3}" ] && [ ! -z "${2}" ]
+  then
+    ### Check to see if we have a system setting.
+    LOCAL=$(awk -F: '/^'"${2}.${1}"'=/ {  st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
+    if [ ! -z "${LOCAL}" ]
+    then
+      echo ${LOCAL}
       return
     fi
-  elif [ -z "${3}" ] && [ ! -z "${2}" ]
-  then
-      ### Check to see if we have a system setting.
-      awk -F: '/^'"${2}.${1}"'=/ {  st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF}
-      return
-  else
-    ### Check to see if we have a global setting
-    awk -F: '/^'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF}
-    return
   fi
+
+  ### Check to see if we have a global setting and account for legacy "global."
+  LOCAL=$(awk -F: '/^'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF})
+  if [ -z "${LOCAL}" ]
+  then
+    awk -F: '/^global.'"${1}"='/ { st = index($0,"=");print substr($0,st+1);exit}' ${J_CONF}
+  else
+    echo ${LOCAL}
+  fi
+  return
 }
 
 del_setting() {

packages/sysutils/systemd/scripts/userconfig-setup

@@ -12,7 +12,7 @@ then
   # Copy config files, but don't overwrite.  Only run if /storage is fresh
   rsync -a --ignore-existing --exclude={es_features.cfg,es_systems.cfg} /usr/config/* /storage/.config/ >/var/log/configure.log 2>&1
 
-  if [ -d "/usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config" ]
+  if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ]
   then
     rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
   fi

packages/ui/emulationstation/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="0885bd045b0fab8b6066b0d696b020d6bfc4a05b"
+PKG_VERSION="f743fd3"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"

packages/wayland/weston/package.mk

@@ -40,7 +40,7 @@ PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \
                        -Ddemo-clients=false \
                        -Dsimple-clients=[] \
                        -Dresize-pool=false \
-                       -Dwcap-decode=false \
+                       -Dwcap-decode=true \
                        -Dtest-junit-xml=false \
                        -Dtest-skip-is-failure=false \
                        -Dtest-gl-renderer=false \