From 9c0ef624ad371189c5f5da12f2e45b5111ed64b8 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Thu, 3 Nov 2022 06:28:20 -0400
Subject: [PATCH] * Fix mame package hash AGAIN. * PPSSPP now works with Vulkan
 on x86_64.

---
 packages/games/emulators/PPSSPPSDL/package.mk | 19 +++++++++----------
 packages/games/libretro/mame/package.mk       | 16 +++++++++++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/packages/games/emulators/PPSSPPSDL/package.mk b/packages/games/emulators/PPSSPPSDL/package.mk
index f62441a0f..cd621a7b3 100644
--- a/packages/games/emulators/PPSSPPSDL/package.mk
+++ b/packages/games/emulators/PPSSPPSDL/package.mk
@@ -32,17 +32,16 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 			   -DUSING_X11_VULKAN=OFF"
 fi
 
-### Vulkan is still not working for PPSSPP on the win600 yet.
-#if [ "${VULKAN_SUPPORT}" = "yes" ]
-#then
-#  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
-#  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
-#                           -DVULKAN=ON \
-#                           -DEGL_NO_X11=1
-#                           -DMESA_EGL_NO_X11_HEADERS=1"
-#else
+if [ "${VULKAN_SUPPORT}" = "yes" ]
+then
+  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
+                           -DVULKAN=ON \
+                           -DEGL_NO_X11=1
+                           -DMESA_EGL_NO_X11_HEADERS=1"
+else
   PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
-#fi
+fi
 
 if [ "${DISPLAYSERVER}" = "wl" ]; then
   PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
diff --git a/packages/games/libretro/mame/package.mk b/packages/games/libretro/mame/package.mk
index 679919e74..ba80f33fe 100644
--- a/packages/games/libretro/mame/package.mk
+++ b/packages/games/libretro/mame/package.mk
@@ -3,7 +3,6 @@
 
 PKG_NAME="mame"
 PKG_VERSION="b8cd169fab8dec3e61f81c9f2df529ac2afe729e"
-PKG_SHA256="f65301ad01293998e031326a7555a20c67ed3335f84c8a69a64d8598a95d4352"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame"
@@ -14,6 +13,14 @@ PKG_SHORTDESC="MAME - Multiple Arcade Machine Emulator"
 PKG_TOOLCHAIN="make"
 PKG_BUILD_FLAGS="-lto"
 
+case ${TARGET_ARCH} in
+  arm|aarch64)
+    PLATFORM=arm64
+  ;;
+  x86_64)
+    PLATFORM=x86_64
+  ;;
+esac
 
 PKG_MAKE_OPTS_TARGET="REGENIE=1 \
 		      VERBOSE=1 \
@@ -28,7 +35,7 @@ PKG_MAKE_OPTS_TARGET="REGENIE=1 \
 		      CONFIG=libretro \
 		      LIBRETRO_OS=unix \
 		      LIBRETRO_CPU= \
-		      PLATFORM=arm64 \
+		      PLATFORM=${PLATFORM} \
 		      ARCH= \
 		      TARGET=mame \
 		      SUBTARGET=mame \
@@ -46,7 +53,10 @@ make_target() {
   unset ARCH
   unset DISTRO
   unset PROJECT
-  export ARCHOPTS="-D__aarch64__ -DASMJIT_BUILD_X86"
+  if [ "${PLATFORM}" = "arm64" ]
+  then
+    export ARCHOPTS="-D__aarch64__ -DASMJIT_BUILD_X86"
+  fi
   make $PKG_MAKE_OPTS_TARGET OVERRIDE_CC=$CC OVERRIDE_CXX=$CXX OVERRIDE_LD=$LD AR=$AR $MAKEFLAGS
 }