Updates patches for latest upstream changes

1 files changed, 28 insertions, 28 deletions

diff --git a/patches/pcsx_rearmed/1000-trimui-support.patch b/patches/pcsx_rearmed/1000-trimui-support.patch
index 8d20c24..3076723 100644
--- a/patches/pcsx_rearmed/1000-trimui-support.patch
+++ b/patches/pcsx_rearmed/1000-trimui-support.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a01c4df..3d08eea 100644
+index e694818..f0a1ba0 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -5,6 +5,8 @@ TARGET ?= pcsx
@@ -12,10 +12,10 @@ index a01c4df..3d08eea 100644
  ifeq ($(platform), $(filter $(platform), vita ctr))
  CFLAGS += -O3 -DNDEBUG
 diff --git a/Makefile.libretro b/Makefile.libretro
-index 1ecd359..432d700 100644
+index 7b9618e..6baefbd 100644
 --- a/Makefile.libretro
 +++ b/Makefile.libretro
-@@ -347,6 +347,27 @@ else ifeq ($(platform), rpi4_64)
+@@ -391,6 +391,27 @@ else ifeq ($(platform), rpi4_64)
          fpic := -fPIC
          CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
  
@@ -43,7 +43,7 @@ index 1ecd359..432d700 100644
  # Classic Platforms ####################
  # Platform affix = classic_<ISA>_<µARCH>
  # Help at https://modmyclassic.com/comp
-@@ -459,6 +480,13 @@ CFLAGS += $(fpic)
+@@ -516,6 +537,13 @@ CFLAGS += $(fpic)
  MAIN_LDFLAGS += -shared
  MAIN_LDLIBS += $(LIBPTHREAD) $(LIBM) $(LIBDL) $(LIBZ)
  
@@ -58,41 +58,32 @@ index 1ecd359..432d700 100644
  ifeq ($(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep __SIZEOF_LONG__ | awk '{print $$3}'),4)
  CFLAGS += -D_FILE_OFFSET_BITS=64
 diff --git a/frontend/libretro.c b/frontend/libretro.c
-index f3e3c2b..8497459 100644
+index 3e74b23..b4a8385 100644
 --- a/frontend/libretro.c
 +++ b/frontend/libretro.c
-@@ -2944,7 +2944,7 @@ void retro_init(void)
+@@ -3034,7 +3034,7 @@ void retro_init(void)
      * we have to do this because cache misses and some IO penalties
      * are not emulated. Warning: changing this may break compatibility. */
-    cycle_multiplier = 175;
+    Config.cycle_multiplier = CYCLE_MULT_DEFAULT;
 -#if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
 +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(_TRIMUI)
-    cycle_multiplier = 200;
+    Config.cycle_multiplier = 200;
  #endif
     pl_rearmed_cbs.gpu_peops.iUseDither = 1;
 diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
-index a1b85d4..775ac58 100644
+index 58e1b72..4d6ae43 100644
 --- a/frontend/libretro_core_options.h
 +++ b/frontend/libretro_core_options.h
-@@ -516,7 +516,7 @@ struct retro_core_option_definition option_defs_us[] = {
-          { "enabled",  NULL },
-          { NULL, NULL },
-       },
--#if defined HAVE_LIBNX || defined _3DS
-+#if defined HAVE_LIBNX || defined _3DS || defined _TRIMUI
- 	  "disabled",
- #else
-       "enabled",
-@@ -541,7 +541,7 @@ struct retro_core_option_definition option_defs_us[] = {
-    {
-       "pcsx_rearmed_psxclock",
-       "PSX CPU Clock",
+@@ -206,7 +206,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
+ #if defined(LIGHTREC)
+       " Currently doesn't work with Lightrec dynarec."
+ #endif
 -#if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
 +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(_TRIMUI)
-       "Overclock or underclock the PSX clock. Default is 50",
+       " Default is 50."
  #else
-       "Overclock or underclock the PSX clock. Default is 57",
-@@ -620,7 +620,7 @@ struct retro_core_option_definition option_defs_us[] = {
+       " Default is 57."
+@@ -288,7 +288,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
           { "100", NULL },
           { NULL, NULL },
        },
@@ -101,11 +92,20 @@ index a1b85d4..775ac58 100644
        "50",
  #else
        "57",
+@@ -306,7 +306,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
+          { "enabled",  NULL },
+          { NULL, NULL },
+       },
+-#if defined HAVE_LIBNX || defined _3DS
++#if defined HAVE_LIBNX || defined _3DS || defined _TRIMUI
+       "disabled",
+ #else
+       "enabled",
 diff --git a/frontend/main.c b/frontend/main.c
-index d3c7d40..7610146 100644
+index fbff0f5..3b2abe4 100644
 --- a/frontend/main.c
 +++ b/frontend/main.c
-@@ -154,6 +154,6 @@ void emu_set_default_config(void)
+@@ -164,7 +164,7 @@ void emu_set_default_config(void)
  	spu_config.iVolume = 768;
  	spu_config.iTempo = 0;
  	spu_config.iUseThread = 1; // no effect if only 1 core is detected
@@ -113,4 +113,4 @@ index d3c7d40..7610146 100644
 +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(_TRIMUI) /* XXX GPH hack */
  	spu_config.iUseReverb = 0;
  	spu_config.iUseInterpolation = 0;
-#ifndef(_MIYOO)
+ #ifndef HAVE_LIBRETRO