Merge pull request #2375 from r3claimer/next

MelonDS-SA: fix build and launch script issues.

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/config/SM8250/melonDS.ini

@@ -58,7 +58,7 @@ HKJoy_SaveState=-1
 HKJoy_LoadState=-1
 JoystickID=0
 WindowWidth=1920
-WindowHeight=1152
+WindowHeight=1080
 WindowMax=0
 ScreenRotation=0
 ScreenGap=0

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/package.mk

@@ -27,6 +27,11 @@ then
   PKG_DEPENDS_TARGET+=" ${VULKAN}"
 fi
 
+get_graphicdrivers
+if listcontains "${GRAPHIC_DRIVERS}" "(panfrost)"; then
+  GRAPHICS_DRIVER="panfrost"
+fi
+
 pre_configure_target() {
 export CFLAGS+=" -Wno-sign-compare"
 export CXXFLAGS="${CXXFLAGS} -Wno-sign-compare"
@@ -58,8 +63,8 @@ makeinstall_target() {
 }
 
 post_install() {
-  case ${TARGET_ARCH} in
-    aarch64)
+  case ${GRAPHICS_DRIVER} in
+    panfrost)
       PANFROST="export MESA_GL_VERSION_OVERRIDE=3.3"
       ;;
     *)

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh

@@ -78,13 +78,16 @@ else
 fi
 
 #Graphics Backend
-if [ "$GRENDERER" > "0" ]; then
-	sed -i "/^ScreenUseGL=/c\ScreenUseGL=$GRENDERER" "${CONF_DIR}/${MELONDS_INI}"
-	sed -i "/^3DRenderer=/c\3DRenderer=1" "${CONF_DIR}/${MELONDS_INI}"
-else
-	sed -i '/^ScreenUseGL=/c\ScreenUseGL=0' "${CONF_DIR}/${MELONDS_INI}"
-	sed -i '/^3DRenderer=/c\3DRenderer=0' "${CONF_DIR}/${MELONDS_INI}"
-fi
+case "$GRENDERER" in
+  "1"|"2")
+    sed -i "/^ScreenUseGL=/c\ScreenUseGL=1" "${CONF_DIR}/${MELONDS_INI}"
+    sed -i "/^3DRenderer=/c\3DRenderer=$GRENDERER" "${CONF_DIR}/${MELONDS_INI}"
+  ;;
+  *)
+    sed -i '/^ScreenUseGL=/c\ScreenUseGL=0' "${CONF_DIR}/${MELONDS_INI}"
+    sed -i '/^3DRenderer=/c\3DRenderer=0' "${CONF_DIR}/${MELONDS_INI}"
+  ;;
+esac
 
 #Internal Resolution
 if [ "$IRES" > "0" ]; then

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

@@ -1066,7 +1066,7 @@
   </emulator>
   <emulator name="melonds">
    <cores>
-    <core name="melonds-sa">
+    <core name="melonds-sa" features="cheevos">
      <features>
       <feature name="console type">
         <choice name="ds" value="0"/>