Merge pull request #8413 from jdorigao/mupen-core

updated: mupen64plus cores
batocera-linux · Mar 26, 2023 · 97fa5bd · 97fa5bd
2 parents 0093174 + 182e844
commit 97fa5bd
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 46 deletions.
diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-audio-sdl/mupen64plus-audio-sdl.mk b/package/batocera/emulators/mupen64plus/mupen64plus-audio-sdl/mupen64plus-audio-sdl.mk
@@ -3,8 +3,8 @@
 # mupen64plus-audio-sdl
 #
 ################################################################################
-# Version.: Commits on Oct 01, 2022
-MUPEN64PLUS_AUDIO_SDL_VERSION = 8f372a02b0d3e660feba1d727b47a1eb2664404c
+# Version.: Commits on Mar 03, 2023
+MUPEN64PLUS_AUDIO_SDL_VERSION = 8d5df662e91cae8c4ad327d67a2ccaffc486a88c
 MUPEN64PLUS_AUDIO_SDL_SITE = $(call github,mupen64plus,mupen64plus-audio-sdl,$(MUPEN64PLUS_AUDIO_SDL_VERSION))
 MUPEN64PLUS_AUDIO_SDL_LICENSE = GPLv2
 MUPEN64PLUS_AUDIO_SDL_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-core/003-statenameasromfilename.patch b/package/batocera/emulators/mupen64plus/mupen64plus-core/003-statenameasromfilename.patch
@@ -1,57 +1,55 @@
 diff --git a/src/api/frontend.c b/src/api/frontend.c
-index 0f8c344..253e7c9 100644
+index f2f8c04..ee3cc4f 100644
 --- a/src/api/frontend.c
 +++ b/src/api/frontend.c
-@@ -176,6 +176,9 @@ EXPORT m64p_error CALL CoreDoCommand(m64p_command Command, int ParamInt, void *P
+@@ -177,6 +177,9 @@ EXPORT m64p_error CALL CoreDoCommand(m64p_command Command, int ParamInt, void *P
      {
          case M64CMD_NOP:
              return M64ERR_SUCCESS;
 +        case M64CMD_ROM_FILENAME:
 +            strncpy(g_rom_filename, (const unsigned char *) ParamPtr, ParamInt);
 +            return M64ERR_SUCCESS;
          case M64CMD_ROM_OPEN:
-             if (g_EmulatorRunning || l_ROMOpen)
+             if (g_EmulatorRunning || l_DiskOpen || l_ROMOpen)
                  return M64ERR_INVALID_STATE;
 diff --git a/src/api/m64p_types.h b/src/api/m64p_types.h
-index d36ca80..960bebd 100644
+index dd95107..88970e7 100644
 --- a/src/api/m64p_types.h
 +++ b/src/api/m64p_types.h
-@@ -168,7 +168,8 @@ typedef enum {
-   M64CMD_NETPLAY_GET_VERSION,
+@@ -169,6 +169,7 @@ typedef enum {
    M64CMD_NETPLAY_CLOSE,
    M64CMD_PIF_OPEN,
--  M64CMD_ROM_SET_SETTINGS
-+  M64CMD_ROM_SET_SETTINGS,
-+  M64CMD_ROM_FILENAME
+   M64CMD_ROM_SET_SETTINGS,
++  M64CMD_ROM_FILENAME,
+   M64CMD_DISK_OPEN,
+   M64CMD_DISK_CLOSE
  } m64p_command;
-
- typedef struct {
 diff --git a/src/main/main.c b/src/main/main.c
-index 4ee1c98..2652746 100644
+index c1cccd5..d77cd2d 100644
 --- a/src/main/main.c
 +++ b/src/main/main.c
 @@ -114,6 +114,7 @@ uint32_t g_start_address = UINT32_C(0xa4000040);
  struct device g_dev;
-
+ 
  m64p_media_loader g_media_loader;
 +char g_rom_filename[1024] = "";
-
+ 
  int g_gs_vi_counter = 0;
-
+ 
 diff --git a/src/main/main.h b/src/main/main.h
-index 54797b9..227b44a 100644
+index 3aacca3..e03574b 100644
 --- a/src/main/main.h
 +++ b/src/main/main.h
 @@ -50,6 +50,7 @@ extern void* g_mem_base;
  extern struct device g_dev;
-
+ 
  extern m64p_media_loader g_media_loader;
 +extern char g_rom_filename[1024];
-
+ 
  extern m64p_frame_callback g_FrameCallback;
-
+ 
 diff --git a/src/main/savestates.c b/src/main/savestates.c
-index fea8bdd..8ed6f83 100644
+index 56e307d..b2ca7f6 100644
 --- a/src/main/savestates.c
 +++ b/src/main/savestates.c
 @@ -86,6 +86,12 @@ static char *savestates_generate_path(savestates_type type)
@@ -66,7 +64,7 @@ index fea8bdd..8ed6f83 100644
 +
          char *filepath;
          size_t size = 0;
-
+ 
 @@ -93,7 +99,7 @@ static char *savestates_generate_path(savestates_type type)
          {
              case savestates_type_m64p:
@@ -89,36 +87,36 @@ index fea8bdd..8ed6f83 100644
                  break;
              default:
                  filepath = NULL;
-@@ -2144,6 +2150,7 @@ int savestates_save(void)
+@@ -2145,6 +2151,7 @@ int savestates_save(void)
      char *filepath;
      int ret = 0;
      const struct device* dev = &g_dev;
 +    char ScreenshotFileName[256];
-
+ 
      /* Can only save PJ64 savestates on VI / COMPARE interrupt.
         Otherwise try again in a little while. */
-@@ -2167,9 +2174,13 @@ int savestates_save(void)
+@@ -2168,9 +2175,13 @@ int savestates_save(void)
              case savestates_type_pj64_unc: ret = savestates_save_pj64_unc(dev, filepath); break;
              default: ret = 0; break;
          }
 +        strncpy(ScreenshotFileName, filepath, 251);
 +        strncat(ScreenshotFileName, ".png", 4);
          free(filepath);
      }
-
+ 
 +    TakeScreenshotToFile(ScreenshotFileName, 0);
 +
      // deliver callback to indicate completion of state saving operation
      StateChanged(M64CORE_STATE_SAVECOMPLETE, ret);
-
+ 
 diff --git a/src/main/screenshot.c b/src/main/screenshot.c
 index 7f2260e..4866bf5 100644
 --- a/src/main/screenshot.c
 +++ b/src/main/screenshot.c
 @@ -224,6 +224,12 @@ void TakeScreenshot(int iFrameNumber)
      if (filename == NULL)
          return;
-
+ 
 +    TakeScreenshotToFile(filename, iFrameNumber);
 +    free(filename);
 +}
@@ -135,7 +133,7 @@ index 7f2260e..4866bf5 100644
 -        free(filename);
          return;
      }
-
+ 
 @@ -244,7 +249,6 @@ void TakeScreenshot(int iFrameNumber)
      SaveRGBBufferToFile(filename, pucFrame, width, height, width * 3);
      // free the memory
@@ -149,9 +147,9 @@ index c7f6bad..fdc3e36 100644
 --- a/src/main/screenshot.h
 +++ b/src/main/screenshot.h
 @@ -24,5 +24,6 @@
-
+ 
  void ScreenshotRomOpen(void);
  void TakeScreenshot(int iFrameNumber);
 +void TakeScreenshotToFile(char *filename, int iFrameNumber);
-
+ 
  #endif
diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk b/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk
@@ -3,8 +3,8 @@
 # mupen64plus-core
 #
 ################################################################################
-# Version.: Commits on Dec 3, 2022
-MUPEN64PLUS_CORE_VERSION = f63e1b35063241738d848f73311496b76c8aa918
+# Version.: Commits on Mar 11, 2023
+MUPEN64PLUS_CORE_VERSION = d4f3e12db0609158c7b4e0beef2bb950aad0ccb9
 MUPEN64PLUS_CORE_SITE = $(call github,mupen64plus,mupen64plus-core,$(MUPEN64PLUS_CORE_VERSION))
 MUPEN64PLUS_CORE_LICENSE = GPLv2
 MUPEN64PLUS_CORE_DEPENDENCIES = sdl2 alsa-lib freetype dejavu

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-gliden64/mupen64plus-gliden64.mk b/package/batocera/emulators/mupen64plus/mupen64plus-gliden64/mupen64plus-gliden64.mk
@@ -3,8 +3,8 @@
 # mupen64plus-gliden64-plugin
 #
 ################################################################################
-# Version.: Commits on Feb 15, 2023
-MUPEN64PLUS_GLIDEN64_VERSION = 263a7bd2ca81759ece98209bd282a6c1173a129f
+# Version.: Commits on Feb 25, 2023
+MUPEN64PLUS_GLIDEN64_VERSION = 1f4d04f43b53739bc9b128ab5577d20e3d60ed6a
 MUPEN64PLUS_GLIDEN64_SITE = $(call github,gonetz,GLideN64,$(MUPEN64PLUS_GLIDEN64_VERSION))
 MUPEN64PLUS_GLIDEN64_LICENSE = GPLv2
 MUPEN64PLUS_GLIDEN64_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core libpng zlib

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-input-sdl/mupen64plus-input-sdl.mk b/package/batocera/emulators/mupen64plus/mupen64plus-input-sdl/mupen64plus-input-sdl.mk
@@ -3,8 +3,8 @@
 # mupen64plus-input-sdl
 #
 ################################################################################
-# Version.: Commits on Nov 30, 2022
-MUPEN64PLUS_INPUT_SDL_VERSION = aa181483bfcac8901184f8c7590e4246eba5508b
+# Version.: Commits on Mar 20, 2023
+MUPEN64PLUS_INPUT_SDL_VERSION = b6fd2f99d7607b9822349c5554aacd6d0ffec4c0
 MUPEN64PLUS_INPUT_SDL_SITE = $(call github,mupen64plus,mupen64plus-input-sdl,$(MUPEN64PLUS_INPUT_SDL_VERSION))
 MUPEN64PLUS_INPUT_SDL_LICENSE = GPLv2
 MUPEN64PLUS_INPUT_SDL_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-rsp-hle/mupen64plus-rsp-hle.mk b/package/batocera/emulators/mupen64plus/mupen64plus-rsp-hle/mupen64plus-rsp-hle.mk
@@ -3,8 +3,8 @@
 # mupen64plus-rsp-hle
 #
 ################################################################################
-# Version.: Commits on Sep 30, 2022
-MUPEN64PLUS_RSP_HLE_VERSION = ca917cec14942470630515e3dd7624cf4dc29154
+# Version.: Commits on Mar 03, 2022
+MUPEN64PLUS_RSP_HLE_VERSION = bbfba920fc00c53c9b4958c2e7594127089cfda3
 MUPEN64PLUS_RSP_HLE_SITE = $(call github,mupen64plus,mupen64plus-rsp-hle,$(MUPEN64PLUS_RSP_HLE_VERSION))
 MUPEN64PLUS_RSP_HLE_LICENSE = GPLv2
 MUPEN64PLUS_RSP_HLE_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-ui-console/mupen64plus-ui-console.mk b/package/batocera/emulators/mupen64plus/mupen64plus-ui-console/mupen64plus-ui-console.mk
@@ -3,8 +3,8 @@
 # mupen64plus-ui-console
 #
 ################################################################################
-# Version.: Commits on Oct 01, 2022
-MUPEN64PLUS_UI_CONSOLE_VERSION = 3ad5cbb56fcf4921ffae8c7b8ee52ea0ae82c044
+# Version.: Commits on Mar 03, 2023
+MUPEN64PLUS_UI_CONSOLE_VERSION = 674dc3e9ec0d31b9a978c6df31d8afd04994ee93
 MUPEN64PLUS_UI_CONSOLE_SITE = $(call github,mupen64plus,mupen64plus-ui-console,$(MUPEN64PLUS_UI_CONSOLE_VERSION))
 MUPEN64PLUS_UI_CONSOLE_LICENSE = GPLv2
 MUPEN64PLUS_UI_CONSOLE_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core

diff --git a/...tocera/emulators/mupen64plus/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2.mk b/...tocera/emulators/mupen64plus/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2.mk
@@ -3,8 +3,8 @@
 # mupen64plus-video-glide64mk2
 #
 ################################################################################
-# Version.: Commits on Nov 17, 2022
-MUPEN64PLUS_VIDEO_GLIDE64MK2_VERSION = a07050d143dddff921180b081164d46aaef2eb29
+# Version.: Commits on Mar 03, 2023
+MUPEN64PLUS_VIDEO_GLIDE64MK2_VERSION = 497a8255ac962c0090487514268011fe509b1e2c
 MUPEN64PLUS_VIDEO_GLIDE64MK2_SITE = $(call github,mupen64plus,mupen64plus-video-glide64mk2,$(MUPEN64PLUS_VIDEO_GLIDE64MK2_VERSION))
 MUPEN64PLUS_VIDEO_GLIDE64MK2_LICENSE = GPLv2
 MUPEN64PLUS_VIDEO_GLIDE64MK2_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core boost

diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-video-rice/mupen64plus-video-rice.mk b/package/batocera/emulators/mupen64plus/mupen64plus-video-rice/mupen64plus-video-rice.mk
@@ -3,8 +3,8 @@
 # mupen64plus-video-rice
 #
 ################################################################################
-# Version.: Commits on Sep 30, 2022
-MUPEN64PLUS_VIDEO_RICE_VERSION = 97e0acff02e62dee7006337a2eb6e3ef5299d096
+# Version.: Commits on Mar 03, 2023
+MUPEN64PLUS_VIDEO_RICE_VERSION = f443d6c25350b4b39e578e8495ec727ad3ceb900
 MUPEN64PLUS_VIDEO_RICE_SITE = $(call github,mupen64plus,mupen64plus-video-rice,$(MUPEN64PLUS_VIDEO_RICE_VERSION))
 MUPEN64PLUS_VIDEO_RICE_LICENSE = GPLv2
 MUPEN64PLUS_VIDEO_RICE_DEPENDENCIES = sdl2 alsa-lib mupen64plus-core boost