From 0a40303ac6cea506ff678986af5c43d3f689352b Mon Sep 17 00:00:00 2001
From: neonloop
Date: Wed, 20 Oct 2021 00:01:31 +0000
Subject: Updates patches for upstream changes

---
 patches/gpsp/0001-avoid-audio-popping.patch | 16 ----------------
 patches/gpsp/1000-trimui-build.patch        |  2 +-
 patches/mame2000/0004-rotation.patch        |  6 +++---
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 patches/gpsp/0001-avoid-audio-popping.patch

diff --git a/patches/gpsp/0001-avoid-audio-popping.patch b/patches/gpsp/0001-avoid-audio-popping.patch
deleted file mode 100644
index ed868a4..0000000
--- a/patches/gpsp/0001-avoid-audio-popping.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/sound.h b/sound.h
-index 08d1de5..93221d5 100644
---- a/sound.h
-+++ b/sound.h
-@@ -24,8 +24,10 @@
- #define BUFFER_SIZE_MASK   (BUFFER_SIZE - 1)
- 
- #define GBA_SOUND_FREQUENCY   (64 * 1024)
-+#define GBA_60HZ_RATE 16853760.0f /* 228*(272+960)*60 */
- 
--#define GBC_BASE_RATE ((float)(16 * 1024 * 1024))
-+// run GBA at 60Hz (~0.5% faster) to better match host display
-+#define GBC_BASE_RATE GBA_60HZ_RATE
- 
- typedef enum
- {
diff --git a/patches/gpsp/1000-trimui-build.patch b/patches/gpsp/1000-trimui-build.patch
index 2f9e7da..ecf9623 100644
--- a/patches/gpsp/1000-trimui-build.patch
+++ b/patches/gpsp/1000-trimui-build.patch
@@ -10,7 +10,7 @@ index ecefd12..91fc859 100644
 +  TARGET := $(TARGET_NAME)_libretro.so
 +	CC = $(CROSS_COMPILE)gcc
 +  SHARED := -shared -Wl,--version-script=link.T -mcpu=arm926ej-s -mtune=arm926ej-s
-+	CFLAGS += -ffast-math -fdata-sections -ffunction-sections -flto -fno-PIC
++	CFLAGS += -ffast-math -fdata-sections -ffunction-sections -flto -fno-PIC -DOVERCLOCK_60FPS
 +	LDFLAGS += -flto
 +	ifeq (,$(DEBUG))
 +		LDFLAGS += -s
diff --git a/patches/mame2000/0004-rotation.patch b/patches/mame2000/0004-rotation.patch
index 5601a64..19c705c 100644
--- a/patches/mame2000/0004-rotation.patch
+++ b/patches/mame2000/0004-rotation.patch
@@ -1,9 +1,9 @@
 diff --git a/src/libretro/libretro.c b/src/libretro/libretro.c
-index f9b3cfe..0171ac1 100644
+index adb09c4..53fc5e2 100644
 --- a/src/libretro/libretro.c
 +++ b/src/libretro/libretro.c
 @@ -68,6 +68,8 @@ int should_skip_frame                    = 0;
- static int sample_rate                   = 32000;
+ static int sample_rate                   = 22050;
  static int stereo_enabled                = true;
  
 +static int rotate                        = false;
@@ -33,7 +33,7 @@ index f9b3cfe..0171ac1 100644
         ((frameskip_type     != prev_frameskip_type)))
 @@ -312,6 +327,7 @@ void retro_set_environment(retro_environment_t cb)
        { "mame2000-show_gameinfo", "Show Game Information; disabled|enabled" },
-       { "mame2000-sample_rate", "Audio Rate (Restart); 32000|11025|22050|32000|44100" },
+       { "mame2000-sample_rate", "Audio Rate (Restart); 22050|11025|22050|32000|44100" },
        { "mame2000-stereo", "Stereo (Restart); enabled|disabled" },
 +      { "mame2000-rotate", "Rotate (Restart); disabled|enabled" },
        { NULL, NULL },
-- 
cgit v1.2.3