From 6c8e5ef7bd874e00dd2da044bac51edcfdb1b833 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 23 Oct 2024 13:11:09 +0200 Subject: [PATCH 1/2] feat: add lr-dolhpin for rpi5 --- configs/recalbox-rpi5_64_defconfig | 1 + package/dolphin-emu/003-hide-osd-msg.patch | 17 +++++++++++++++++ package/libretro-dolphin/003-hide-osd-msg.patch | 15 +++++++++++++++ package/libretro-dolphin/libretro-dolphin.mk | 11 +++++++++-- .../recalbox-romfs2/systems/gamecube/system.ini | 3 ++- 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 package/dolphin-emu/003-hide-osd-msg.patch create mode 100644 package/libretro-dolphin/003-hide-osd-msg.patch diff --git a/configs/recalbox-rpi5_64_defconfig b/configs/recalbox-rpi5_64_defconfig index 917d2ca9b6..0f2adb8017 100644 --- a/configs/recalbox-rpi5_64_defconfig +++ b/configs/recalbox-rpi5_64_defconfig @@ -328,6 +328,7 @@ BR2_PACKAGE_LIBRETRO_XMIL=y BR2_PACKAGE_LIBRETRO_XRICK=y BR2_PACKAGE_LIBRETRO_YABASANSHIRO=y BR2_PACKAGE_LIBRETRO_WASM4=y +BR2_PACKAGE_LIBRETRO_DOLPHIN=y BR2_PACKAGE_DOLPHIN_EMU=y BR2_PACKAGE_JSTEST2=y BR2_PACKAGE_WSD=y diff --git a/package/dolphin-emu/003-hide-osd-msg.patch b/package/dolphin-emu/003-hide-osd-msg.patch new file mode 100644 index 0000000000..10b7202868 --- /dev/null +++ b/package/dolphin-emu/003-hide-osd-msg.patch @@ -0,0 +1,17 @@ +diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp +index ab31592..4186ab9 100644 +--- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp ++++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp +@@ -602,9 +602,9 @@ bool PopulateConfig(GLContext* m_main_gl_context) + g_Config.VerifyValidity(); + UpdateActiveConfig(); + +- OSD::AddMessage(fmt::format("Video Info: {}, {}, {}", g_ogl_config.gl_vendor, +- g_ogl_config.gl_renderer, g_ogl_config.gl_version), +- 5000); ++// OSD::AddMessage(fmt::format("Video Info: {}, {}, {}", g_ogl_config.gl_vendor, ++// g_ogl_config.gl_renderer, g_ogl_config.gl_version), ++// 5000); + + if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory) + { diff --git a/package/libretro-dolphin/003-hide-osd-msg.patch b/package/libretro-dolphin/003-hide-osd-msg.patch new file mode 100644 index 0000000000..32865142be --- /dev/null +++ b/package/libretro-dolphin/003-hide-osd-msg.patch @@ -0,0 +1,15 @@ +--- a/Source/Core/VideoBackends/OGL/Render.cpp 2024-10-24 17:17:54.959904774 +0200 ++++ b/Source/Core/VideoBackends/OGL/Render.cpp 2024-10-24 17:18:03.824828411 +0200 +@@ -734,9 +734,9 @@ + g_Config.VerifyValidity(); + UpdateActiveConfig(); + +- OSD::AddMessage(StringFromFormat("Video Info: %s, %s, %s", g_ogl_config.gl_vendor, +- g_ogl_config.gl_renderer, g_ogl_config.gl_version), +- 5000); ++ //OSD::AddMessage(StringFromFormat("Video Info: %s, %s, %s", g_ogl_config.gl_vendor, ++ // g_ogl_config.gl_renderer, g_ogl_config.gl_version), ++ // 5000); + + if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory) + { diff --git a/package/libretro-dolphin/libretro-dolphin.mk b/package/libretro-dolphin/libretro-dolphin.mk index 9f0150350e..fe4963a03f 100644 --- a/package/libretro-dolphin/libretro-dolphin.mk +++ b/package/libretro-dolphin/libretro-dolphin.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRETRO_DOLPHIN_VERSION = 2f4b0f7902257d40a054f60b2c670d6e314f2a04 +LIBRETRO_DOLPHIN_VERSION = 89a4df725d4eb24537728f7d655cddb1add25c18 LIBRETRO_DOLPHIN_SITE = https://github.com/libretro/dolphin LIBRETRO_DOLPHIN_SITE_METHOD=git LIBRETRO_DOLPHIN_GIT_SUBMODULES=YES @@ -13,7 +13,8 @@ LIBRETRO_DOLPHIN_DEPENDENCIES = retroarch libevdev fmt bluez5_utils LIBRETRO_DOLPHIN_PLATFORM = $(LIBRETRO_PLATFORM) -LIBRETRO_DOLPHIN_CONF_OPTS = -DUSE_DISCORD_PRESENCE=OFF -DLIBRETRO=ON \ +LIBRETRO_DOLPHIN_CONF_OPTS = -DLIBRETRO=ON \ + -DENABLE_TESTS=OFF \ -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) @@ -26,6 +27,12 @@ LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_EGL=OFF LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_X11=OFF endif +ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI5_64),y) +LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_EGL=ON +LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_X11=OFF +LIBRETRO_DOLPHIN_DEPENDENCIES += vulkan-headers +endif + define LIBRETRO_DOLPHIN_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/dolphin_libretro.so \ $(TARGET_DIR)/usr/lib/libretro/dolphin_libretro.so diff --git a/package/recalbox-romfs2/systems/gamecube/system.ini b/package/recalbox-romfs2/systems/gamecube/system.ini index 08ed459fef..3279289956 100644 --- a/package/recalbox-romfs2/systems/gamecube/system.ini +++ b/package/recalbox-romfs2/systems/gamecube/system.ini @@ -38,7 +38,7 @@ release.date = "2001-09" manufacturer = "Nintendo" retroachievements = 0 crt.multiresolution = 0 -crt.multiregion = 0 +crt.multiregion = 1 [core.0] package = BR2_PACKAGE_DOLPHIN_EMU @@ -64,3 +64,4 @@ netplay = 0 softpatching = 0 compatibility = good speed = good +crt.available = 1 -- GitLab From 5660b8ce484f2964ee86e0afa02bbf9aed53746c Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sun, 17 Nov 2024 16:46:55 +0100 Subject: [PATCH 2/2] feat: use wayland for lr-dolphin --- package/libretro-dolphin/libretro-dolphin.mk | 6 +++--- package/recalbox-romfs2/systems/gamecube/system.ini | 1 + package/retroarch/retroarch.mk | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libretro-dolphin/libretro-dolphin.mk b/package/libretro-dolphin/libretro-dolphin.mk index fe4963a03f..3803163c43 100644 --- a/package/libretro-dolphin/libretro-dolphin.mk +++ b/package/libretro-dolphin/libretro-dolphin.mk @@ -28,9 +28,9 @@ LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_X11=OFF endif ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI5_64),y) -LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_EGL=ON -LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_X11=OFF -LIBRETRO_DOLPHIN_DEPENDENCIES += vulkan-headers +LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_EGL=OFF +LIBRETRO_DOLPHIN_CONF_OPTS += -DENABLE_X11=ON +LIBRETRO_DOLPHIN_DEPENDENCIES += vulkan-headers xwayland endif define LIBRETRO_DOLPHIN_INSTALL_TARGET_CMDS diff --git a/package/recalbox-romfs2/systems/gamecube/system.ini b/package/recalbox-romfs2/systems/gamecube/system.ini index 3279289956..f01d9854cc 100644 --- a/package/recalbox-romfs2/systems/gamecube/system.ini +++ b/package/recalbox-romfs2/systems/gamecube/system.ini @@ -65,3 +65,4 @@ softpatching = 0 compatibility = good speed = good crt.available = 1 +video.backend.rpi5_64 = wayland diff --git a/package/retroarch/retroarch.mk b/package/retroarch/retroarch.mk index 7df26ada98..e84eb74faf 100644 --- a/package/retroarch/retroarch.mk +++ b/package/retroarch/retroarch.mk @@ -94,6 +94,10 @@ RETROARCH_CONF_OPTS += --enable-networking ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) RETROARCH_CONF_OPTS += --enable-x11 RETROARCH_DEPENDENCIES += xserver_xorg-server +else ifeq ($(BR2_PACKAGE_XWAYLAND),y) +RETROARCH_CONF_OPTS += --enable-wayland +RETROARCH_CONF_OPTS += --enable-x11 +RETROARCH_DEPENDENCIES += wayland xwayland else RETROARCH_CONF_OPTS += --disable-x11 endif -- GitLab