Merge pull request #920 from fewtarius/dev

Continue to refine Wii U support, bump kernel to 6.1.4.

packages/games/emulators/cemu/scripts/start_cemu.sh

@@ -50,13 +50,26 @@ then
 fi
 
 # Make sure the basic controller profiles exist.
-for controller in controller0.xml controller1.xml
-do
-  if [ ! -f /storage/.config/Cemu/controllerProfiles/${controller} ]
-  then
-    cp /usr/config/Cemu/controllerProfiles/${controller} /storage/.config/Cemu/controllerProfiles
-  fi
-done
+if [ ! -f /storage/.config/Cemu/controllerProfiles/controller0.xml ]
+then
+  cp /usr/config/Cemu/controllerProfiles/controller0.xml /storage/.config/Cemu/controllerProfiles
+fi
+
+FILE=$(echo $@ | sed "s#^/.*/##g")
+FPS=$(get_setting show_fps wiiu "${FILE}")
+CON=$(get_setting wiiu_controller_profile wiiu "${FILE}")
+
+if [ -z "${FPS}" ]
+then
+  FPS="0"
+fi
+if [ -z "${CON}" ]
+then
+  CON="Wii U GamePad"
+fi
+
+xmlstarlet ed --inplace -u "//Overlay/Position" -v "${FPS}" /storage/.config/Cemu/settings.xml
+xmlstarlet ed --inplace -u "//emulated_controller/type" -v "${CON}" /storage/.config/Cemu/controllerProfiles/controller0.xml
 
 sed -i "s#<fullscreen>.*</fullscreen>#<fullscreen>true</fullscreen>#g" .config/Cemu/settings.xml
 sed -i "s#<TVDevice>.*</TVDevice>#<TVDevice>$(pactl get-default-sink)</TVDevice>#g" .config/Cemu/settings.xml

packages/kernel/linux/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.1.2"
+PKG_VERSION="6.1.4"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"

packages/ui/emulationstation/config/common/es_features.cfg

@@ -76,6 +76,20 @@
       </feature>
     </features>
   </emulator>
+  <emulator name="cemu">
+    <features>
+      <feature name="show fps">
+        <choice name="yes" value="1"/>
+        <choice name="no" value="0"/>
+      </feature>
+      <feature name="wiiu controller profile">
+        <choice name="Wii U GamePad" value="Wii U GamePad"/>
+        <choice name="Wii U Pro Controller" value="Wii U Pro Controller"/>
+        <choice name="Wii U Classic Controller" value="Wii U Classic Controller"/>
+        <choice name="Wiimote" value="Wiimote"/>
+      </feature>
+    </features>
+  </emulator>
   <emulator name="dolphinsa-wii">
     <features>
       <feature name="anti aliasing">