Merge pull request #274 from brooksytech/bsnes

Add Bsnes mercury performance core and clean up a few items.

packages/games/libretro/bsnes-mercury-performance/package.mk

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="bsnes-mercury-performance"
+PKG_VERSION="4ba6d8d88e57d3193d95e1bcf39e8d31121f76d4"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/libretro/bsnes-mercury"
+PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="BSNES Super Nintendo Libretro Core"
+PKG_IS_ADDON="no"
+PKG_TOOLCHAIN="make"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  if [[ "${DEVICE}" =~ RG351 ]]
+  then
+    PKG_MAKE_OPTS_TARGET+=" platform=RK3326"
+  elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
+  then
+    PKG_MAKE_OPTS_TARGET+=" platform=RK3566"
+  else
+    PKG_MAKE_OPTS_TARGET+=" platform=${DEVICE}"
+  fi
+}
+
+make_target() {
+  make PROFILE=performance
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp bsnes_mercury_performance_libretro.so $INSTALL/usr/lib/libretro/
+}
+

packages/games/libretro/bsnes-mercury-performance/patches/001-set-platform.patch

@@ -0,0 +1,47 @@
+diff --git a/Makefile b/Makefile
+old mode 100644
+new mode 100755
+index fd69183..5f0a709
+--- a/Makefile
++++ b/Makefile
+@@ -155,8 +155,8 @@ endif
+    CXX = c++ -arch arm64 -isysroot $(IOSSDK) 
+    FLAGS += -DHAVE_POSIX_MEMALIGN
+ 
+-# Raspberry Pi 4 in 64bit mode
+-else ifeq ($(platform), rpi4_64)
++# Anbernic RG552
++else ifeq ($(platform), RG552)
+    TARGET := $(TARGET_NAME)_libretro.so
+    fpic := -fPIC
+    SHARED := -shared -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T
+@@ -164,6 +164,29 @@ else ifeq ($(platform), rpi4_64)
+    ASFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72
+    LDFLAGS += -ldl
+    IS_X86 = 0
++   HAVE_NEON = 1
++
++# Anbernic RG503, RG353P
++else ifeq ($(platform), RK3566)
++   TARGET := $(TARGET_NAME)_libretro.so
++   fpic := -fPIC
++   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T
++   FLAGS += -march=armv8-a+crc+simd -mtune=cortex-a55
++   ASFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a55
++   LDFLAGS += -ldl
++   IS_X86 = 0
++   HAVE_NEON = 1
++
++# Anbernic RG351P/M, RG351MP, RG351V
++else ifeq ($(platform), RK3326)
++   TARGET := $(TARGET_NAME)_libretro.so
++   fpic := -fPIC
++   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T
++   FLAGS += -march=armv8-a+crc+simd -mtune=cortex-a35
++   ASFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a35
++   LDFLAGS += -ldl
++   IS_X86 = 0
++   HAVE_NEON = 1
+ 
+ # tvOS
+ else ifeq ($(platform), tvos-arm64)

packages/games/libretro/vitaquake2/package.mk

@@ -18,7 +18,7 @@ pre_make_target() {
 
   if [[ "${DEVICE}" =~ RG351 ]]
   then
-    PKG_MAKE_OPTS_TARGET+=" platform=RG351x"
+    PKG_MAKE_OPTS_TARGET+=" platform=RK3326"
   elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
   then
     PKG_MAKE_OPTS_TARGET+=" platform=RK3566"

packages/games/libretro/vitaquake2/patches/001-set-platform.patch

@@ -17,7 +17,7 @@ index 700146a..f853845 100644
 +    GLES31 := 1
 +
 +# Anbernic RG503, RG353p
-+else ifeq ($(platform), RG503)
++else ifeq ($(platform), RK3566)
 +    TARGET := $(TARGET_NAME)_libretro.so
 +	fpic := -fPIC
 +    SHARED := -shared -Wl,--version-script=$(CORE_DIR)/link.T -Wl,--no-undefined
@@ -27,7 +27,7 @@ index 700146a..f853845 100644
 +    GLES31 := 1
 +
 +# Anbernic RG351P/M, RG351MP, RG351V
-+else ifeq ($(platform), RG351x)
++else ifeq ($(platform), RK3326)
 +    TARGET := $(TARGET_NAME)_libretro.so
 +	fpic := -fPIC
 +    SHARED := -shared -Wl,--version-script=$(CORE_DIR)/link.T -Wl,--no-undefined

packages/jelos/package.mk

@@ -47,7 +47,8 @@ LIBRETRO_CORES="2048 81 a5200 atari800 beetle-gba beetle-lynx beetle-ngp beetle-
                 ppsspp prboom prosystem puae px68k quasi88 quicknes race reminiscence sameboy        \
                 sameduck scummvm smsplus-gx snes9x snes9x2002 snes9x2005_plus snes9x2010 stella      \
                 stella-2014 swanstation TIC-80 tgbdual tyrquake xrick uae4arm uzem vba-next vbam     \
-                vecx vice yabasanshiro xmil mesen virtualjaguar ecwolf_libretro vitaquake2"
+                vecx vice yabasanshiro xmil mesen virtualjaguar ecwolf_libretro vitaquake2           \
+                bsnes-mercury-performance"
 
 PKG_COMPAT=""
 

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

@@ -1839,6 +1839,7 @@
           <core>snes9x2002</core>
           <core>snes9x2005_plus</core>
           <core>beetle_supafaust</core>
+          <core>bsnes_mercury_performance</core>
         </cores>
       </emulator>
     </emulators>

vitaquake2

@@ -1 +0,0 @@
-Subproject commit aed906ef107eb684e18d8889c9bf383cc7b77b84