Add scummvm themes to /usr/config and configure scummvmsa to find them.

packages/games/emulators/scummvmsa/package.mk

@@ -8,33 +8,29 @@ PKG_SHA256="18dccfba99ca0687a46b3143042edaf90b0506f41c14bab9804eae88f07833cd"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"
-PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
+PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain SDL2 SDL2_net freetype fluidsynth-git"
 PKG_SHORTDESC="Script Creation Utility for Maniac Mansion Virtual Machine"
 PKG_LONGDESC="ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files."
 
 pre_configure_target() { 
-  sed -i "s|sdl-config|sdl2-config|g" $PKG_BUILD/configure
-  TARGET_CONFIGURE_OPTS="--host=${TARGET_NAME} --backend=sdl --with-sdl-prefix=${SYSROOT_PREFIX}/usr/bin --disable-debug --enable-release --enable-vkeybd --opengl-mode=gles2"
+  sed -i "s|sdl-config|sdl2-config|g" ${PKG_BUILD}/configure
+  TARGET_CONFIGURE_OPTS="--host=${TARGET_NAME} --backend=sdl --with-sdl-prefix=${TOOLCHAIN}/usr/bin --disable-debug --enable-release --enable-vkeybd --opengl-mode=gles2"
 }
 
 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/config/scummvm/
-  cp -rf $PKG_DIR/config/* $INSTALL/usr/config/scummvm/
+  mkdir -p ${INSTALL}/usr/config/scummvm/
+  cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/scummvm/
 
-  mv $INSTALL/usr/local/bin $INSTALL/usr/
-  cp -rf $PKG_DIR/bin/* $INSTALL/usr/bin
-  chmod 755 $INSTALL/usr/bin/*
+  mkdir -p ${INSTALL}/usr/config/scummvm/themes
+  cp -rf ${PKG_DIR}/gui/themes ${INSTALL}/usr/config/scummvm/themes
+
+  mv ${INSTALL}/usr/local/bin ${INSTALL}/usr/
+  cp -rf ${PKG_DIR}/sources/* ${INSTALL}/usr/bin
+  chmod 755 ${INSTALL}/usr/bin/*
 	
   for i in appdata applications doc icons man; do
-    rm -rf "$INSTALL/usr/local/share/$i"
+    rm -rf "${INSTALL}/usr/local/share/$i"
   done
-
-  for i in residualvm.zip scummmodern.zip scummclassic.zip; do
-    rm -rf "$INSTALL/usr/local/share/scummvm/$i"
-  done
-
-  mkdir -p $INSTALL/usr/local/share/scummvm/
-  cp -rf $PKG_DIR/scummremastered.zip $INSTALL/usr/local/share/scummvm/
 }
 

packages/games/emulators/scummvmsa/sources/start_scummvm.sh

@@ -6,7 +6,7 @@
 # Source predefined functions and variables
 . /etc/profile
 
-CONFIG_DIR="/storage/.config/scummvm"
+CONFIG_DIR="/storage/.config/game/configs/scummvm"
 ROMSPATH="/storage/roms"
 BIOSPATH="${ROMSPATH}/bios"
 GAME=$2
@@ -41,7 +41,7 @@ case $1 in
   "sa")
     set_audio "fluidsynth"
     GAME=$(cat "${GAME}")
-    eval /usr/bin/scummvm --fullscreen --joystick=0 ${GAME}
+    eval /usr/bin/scummvm --fullscreen --joystick=0 --themepath=/usr/config/scummvm/themes ${GAME}
     set_audio "pulseaudio"
   ;;
 

packages/jelos/sources/scripts/runemu.sh

@@ -227,10 +227,6 @@ then
 				RUNTHIS='${TBASH} /usr/bin/m64p.sh "${CORE}" "${ROMNAME}"'
 			fi
 		;;
-		"scummvm")
-			jslisten set "scummvm"
-			RUNTHIS='${TBASH} /usr/bin/scummvm.start sa "${ROMNAME}"'
-		;;
 		"daphne")
 			jslisten set "hypseus"
 			if [ "$EMU" = "HYPSEUS" ]

packages/ui/emulationstation/config/es_systems.cfg

@@ -1437,9 +1437,9 @@
           <core>scummvm</core>
         </cores>
       </emulator>
-      <emulator name="SCUMMVMSA">
+      <emulator name="scummvmsa">
         <cores>
-          <core default="true">SCUMMVMSA</core>
+          <core default="true">scummvmsa</core>
         </cores>
       </emulator>
     </emulators>