Merge pull request #15371 from dmanlfc/rpi-libretro-genesisplusgx

fix libretro-genesisplusgx for rpi's

Author: dmanlfc

package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/001-add-rp3_64-and-rpi5-tuning.patch

@@ -0,0 +1,19 @@
+diff --git a/Makefile.libretro b/Makefile.libretro
+index ac4a707..32950c8 100644
+--- a/Makefile.libretro
++++ b/Makefile.libretro
+@@ -169,10 +169,14 @@ ifneq (,$(findstring unix,$(platform)))
+          PLATFORM_DEFINES += -DARM11 -marm -march=armv6j -mfpu=vfp -mfloat-abi=hard
+       else ifneq (,$(findstring rpi2,$(platform)))
+          PLATFORM_DEFINES += -DARM -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
++      else ifneq (,$(findstring rpi3_64,$(platform)))
++         PLATFORM_DEFINES += -DARM -march=armv8-a+crc+simd -mtune=cortex-a53
+       else ifneq (,$(findstring rpi3,$(platform)))
+          PLATFORM_DEFINES += -DARM -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+       else ifneq (,$(findstring rpi4_64,$(platform)))
+          PLATFORM_DEFINES += -DARM -march=armv8-a+crc+simd -mtune=cortex-a72
++      else ifneq (,$(findstring rpi5,$(platform)))
++         PLATFORM_DEFINES += -DARM -mcpu=cortex-a76 -mtune=cortex-a76
+       endif
+    endif
+    

package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/libretro-genesisplusgx.mk

@@ -12,24 +12,29 @@ LIBRETRO_GENESISPLUSGX_EMULATOR_INFO = genesisplusgx.libretro.core.yml
 
 LIBRETRO_GENESISPLUSGX_PLATFORM = $(LIBRETRO_PLATFORM)
 
-ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2837),y)
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2712),y)
+LIBRETRO_GENESISPLUSGX_PLATFORM += rpi5
+else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y)
+LIBRETRO_GENESISPLUSGX_PLATFORM += rpi4_64
+else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2837),y)
 LIBRETRO_GENESISPLUSGX_PLATFORM += rpi3_64
-
+else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2836),y)
+LIBRETRO_GENESISPLUSGX_PLATFORM += rpi2
+else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2835),y)
+LIBRETRO_GENESISPLUSGX_PLATFORM += rpi1
 else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_S922X),y)
 LIBRETRO_GENESISPLUSGX_PLATFORM += CortexA73_G12B
-
 else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_H3),y)
 LIBRETRO_GENESISPLUSGX_PLATFORM += rpi2
-
 else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_RK3128),y)
 LIBRETRO_GENESISPLUSGX_PLATFORM += rpi2
-
 else ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_ODIN),y)
 LIBRETRO_GENESISPLUSGX_PLATFORM += odin
 endif
 
 define LIBRETRO_GENESISPLUSGX_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D) -f Makefile.libretro platform="$(LIBRETRO_GENESISPLUSGX_PLATFORM)" \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D) -f \
+	    Makefile.libretro platform="$(LIBRETRO_GENESISPLUSGX_PLATFORM)" \
         GIT_VERSION="-$(shell echo $(LIBRETRO_GENESISPLUSGX_VERSION) | cut -c 1-7)"
 endef
 
@@ -39,4 +44,4 @@ define LIBRETRO_GENESISPLUSGX_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-$(eval $(emulator-info-package))
+$(eval $(emulator-info-package))