Add proper rpi5 build flags

closes #1982
libretro · Dec 3, 2024 · bdb9111 · bdb9111
1 parent 266da25
commit bdb9111
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/lakka/libretro_cores/mupen64plus_next/package.mk b/packages/lakka/libretro_cores/mupen64plus_next/package.mk
@@ -55,7 +55,7 @@ pre_make_target() {
       PKG_MAKE_OPTS_TARGET+=" platform=rpi4_64-mesa FORCE_GLES3=1"
       ;;
     RPi5)
-      PKG_MAKE_OPTS_TARGET+=" platform=rpi-mesa FORCE_GLES3=1 CPUFLAGS="
+      PKG_MAKE_OPTS_TARGET+=" platform=rpi5"
       ;;
     Exynos)
       PKG_MAKE_OPTS_TARGET+=" platform=odroid BOARD=ODROID-XU"

diff --git a/packages/lakka/libretro_cores/mupen64plus_next/patches/rpi5buildflags.patch b/packages/lakka/libretro_cores/mupen64plus_next/patches/rpi5buildflags.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index 09eb547..8109905 100644
+--- a/Makefile
++++ b/Makefile
+@@ -175,6 +175,10 @@ else ifneq (,$(findstring rpi,$(platform)))
+          CPUFLAGS += -march=armv8-a+crc -mtune=cortex-a72
+          ARM_CPUFLAGS = -mfpu=neon-fp-armv8
+       endif
++   else ifneq (,$(findstring rpi5,$(platform)))
++      CPUFLAGS += -mcpu=cortex-a76 -mtune=cortex-a76
++      GLES3= 1
++      GL_LIB := -lGLESv3
+    else ifneq (,$(findstring rpi,$(platform)))
+       CPUFLAGS += -mcpu=arm1176jzf-s
+       ARM_CPUFLAGS = -mfpu=vfp