Renames core patch files

First numbers for upstreamable patches. Later numbers for
picoarch-specific patches.

24 files changed, 48 insertions, 35 deletions

diff --git a/patches/fbalpha2012/1000-update-libretro-h.patch b/patches/fbalpha2012/0001-update-libretro-h.patch
index 03c35d2..03c35d2 100644
--- a/patches/fbalpha2012/1000-update-libretro-h.patch
+++ b/patches/fbalpha2012/0001-update-libretro-h.patch
diff --git a/patches/fbalpha2012/1001-add-auto-frameskip.patch b/patches/fbalpha2012/0002-add-auto-frameskip.patch
index e497b81..e497b81 100644
--- a/patches/fbalpha2012/1001-add-auto-frameskip.patch
+++ b/patches/fbalpha2012/0002-add-auto-frameskip.patch
diff --git a/patches/fbalpha2012/0001-trimui-build.patch b/patches/fbalpha2012/1000-trimui-build.patch
index d1710ab..d1710ab 100644
--- a/patches/fbalpha2012/0001-trimui-build.patch
+++ b/patches/fbalpha2012/1000-trimui-build.patch
diff --git a/patches/gambatte/0001-trimui-build.patch b/patches/gambatte/1000-trimui-build.patch
index 9beb11b..9beb11b 100644
--- a/patches/gambatte/0001-trimui-build.patch
+++ b/patches/gambatte/1000-trimui-build.patch
diff --git a/patches/gpsp/1000-avoid-audio-popping.patch b/patches/gpsp/0001-avoid-audio-popping.patch
index ed868a4..ed868a4 100644
--- a/patches/gpsp/1000-avoid-audio-popping.patch
+++ b/patches/gpsp/0001-avoid-audio-popping.patch
diff --git a/patches/gpsp/0001-trimui-support.patch b/patches/gpsp/1000-trimui-build.patch
index b3dd044..b3dd044 100644
--- a/patches/gpsp/0001-trimui-support.patch
+++ b/patches/gpsp/1000-trimui-build.patch
diff --git a/patches/gpsp/0002-core-options.patch b/patches/gpsp/1001-core-options.patch
index 752cfc5..752cfc5 100644
--- a/patches/gpsp/0002-core-options.patch
+++ b/patches/gpsp/1001-core-options.patch
diff --git a/patches/gpsp/0003-frameskip-changes.patch b/patches/gpsp/1002-frameskip-changes.patch
index 3444df9..3444df9 100644
--- a/patches/gpsp/0003-frameskip-changes.patch
+++ b/patches/gpsp/1002-frameskip-changes.patch
diff --git a/patches/mame2000/1000-update-libretro-h.patch b/patches/mame2000/0001-update-libretro-h.patch
index c1568ac..c1568ac 100644
--- a/patches/mame2000/1000-update-libretro-h.patch
+++ b/patches/mame2000/0001-update-libretro-h.patch
diff --git a/patches/mame2000/1001-add-frameskip.patch b/patches/mame2000/0002-add-frameskip.patch
index a07582e..a07582e 100644
--- a/patches/mame2000/1001-add-frameskip.patch
+++ b/patches/mame2000/0002-add-frameskip.patch
diff --git a/patches/mame2000/1002-add-sound-options.patch b/patches/mame2000/0003-add-sound-options.patch
index 266ce95..266ce95 100644
--- a/patches/mame2000/1002-add-sound-options.patch
+++ b/patches/mame2000/0003-add-sound-options.patch
diff --git a/patches/mame2000/1004-rotation.patch b/patches/mame2000/0004-rotation.patch
index f28b452..5601a64 100644
--- a/patches/mame2000/1004-rotation.patch
+++ b/patches/mame2000/0004-rotation.patch
@@ -1,5 +1,5 @@
 diff --git a/src/libretro/libretro.c b/src/libretro/libretro.c
-index aad93bc..2f37f52 100644
+index f9b3cfe..0171ac1 100644
 --- a/src/libretro/libretro.c
 +++ b/src/libretro/libretro.c
 @@ -68,6 +68,8 @@ int should_skip_frame                    = 0;
@@ -32,9 +32,9 @@ index aad93bc..2f37f52 100644
     if (!first_run &&
         ((frameskip_type     != prev_frameskip_type)))
 @@ -312,6 +327,7 @@ void retro_set_environment(retro_environment_t cb)
-       { "mame2000-show_gameinfo", "Show Game Info; disabled|enabled" },
-       { "mame2000-sample_rate", "Snd. Rate (Restart); 11025|22050|32000|44100" },
-       { "mame2000-stereo", "Stereo (Restart); disabled|enabled" },
+       { "mame2000-show_gameinfo", "Show Game Information; disabled|enabled" },
+       { "mame2000-sample_rate", "Audio Rate (Restart); 32000|11025|22050|32000|44100" },
+       { "mame2000-stereo", "Stereo (Restart); enabled|disabled" },
 +      { "mame2000-rotate", "Rotate (Restart); disabled|enabled" },
        { NULL, NULL },
     };
diff --git a/patches/mame2000/0001-trimui-build.patch b/patches/mame2000/1000-trimui-build.patch
index 52492b8..52492b8 100644
--- a/patches/mame2000/0001-trimui-build.patch
+++ b/patches/mame2000/1000-trimui-build.patch
diff --git a/patches/mame2000/1003-shorten-options.patch b/patches/mame2000/1001-shorten-options.patch
index 49e0d5c..14cacc4 100644
--- a/patches/mame2000/1003-shorten-options.patch
+++ b/patches/mame2000/1001-shorten-options.patch
@@ -1,8 +1,8 @@
 diff --git a/src/libretro/libretro.c b/src/libretro/libretro.c
-index f9b3cfe..aad93bc 100644
+index 0171ac1..2f37f52 100644
 --- a/src/libretro/libretro.c
 +++ b/src/libretro/libretro.c
-@@ -306,12 +306,12 @@ void retro_set_environment(retro_environment_t cb)
+@@ -321,12 +321,12 @@ void retro_set_environment(retro_environment_t cb)
  {
     static const struct retro_variable vars[] = {
        { "mame2000-frameskip", "Frameskip ; disabled|auto|threshold" },
@@ -18,6 +18,6 @@ index f9b3cfe..aad93bc 100644
 +      { "mame2000-show_gameinfo", "Show Game Info; disabled|enabled" },
 +      { "mame2000-sample_rate", "Snd. Rate (Restart); 11025|22050|32000|44100" },
 +      { "mame2000-stereo", "Stereo (Restart); disabled|enabled" },
+       { "mame2000-rotate", "Rotate (Restart); disabled|enabled" },
        { NULL, NULL },
     };
-    environ_cb = cb;
diff --git a/patches/mame2000/1005-reduce-vector-game-res.patch b/patches/mame2000/1002-reduce-vector-game-res.patch
index 03103dc..03103dc 100644
--- a/patches/mame2000/1005-reduce-vector-game-res.patch
+++ b/patches/mame2000/1002-reduce-vector-game-res.patch
diff --git a/patches/mame2003_plus/0001-trimui-build.patch b/patches/mame2003_plus/1000-trimui-build.patch
index 8b2bbac..8b2bbac 100644
--- a/patches/mame2003_plus/0001-trimui-build.patch
+++ b/patches/mame2003_plus/1000-trimui-build.patch
diff --git a/patches/snes9x2002/1000-update-libretro-h.patch b/patches/snes9x2002/0001-update-libretro-h.patch
index b5984f2..b5984f2 100644
--- a/patches/snes9x2002/1000-update-libretro-h.patch
+++ b/patches/snes9x2002/0001-update-libretro-h.patch
diff --git a/patches/snes9x2002/1001-audio-frameskip.patch b/patches/snes9x2002/0002-audio-frameskip.patch
index 2154500..2ff6765 100644
--- a/patches/snes9x2002/1001-audio-frameskip.patch
+++ b/patches/snes9x2002/0002-audio-frameskip.patch
@@ -1,5 +1,5 @@
 diff --git a/libretro/libretro.c b/libretro/libretro.c
-index bc64376..b09354a 100644
+index 81ce4aa..3c24e8f 100644
 --- a/libretro/libretro.c
 +++ b/libretro/libretro.c
 @@ -96,6 +96,21 @@ bool8 ROMAPUEnabled                              = 0;
@@ -87,9 +87,9 @@ index bc64376..b09354a 100644
     static const struct retro_variable vars[] =
     {
 +      { "snes9x2002_frameskip", "Frameskip ; disabled|auto|threshold" },
-+      { "snes9x2002_frameskip_threshold", "FS Threshold (%); 30|40|50|60" },
-+      { "snes9x2002_frameskip_interval", "FS Interval; 1|2|3|4|5|6|7|8|9" },
-       { "snes9x2002_overclock_cycles", "Overclock (Restart); disabled|compatible|max" },
++      { "snes9x2002_frameskip_threshold", "Frameskip Threshold (%); 30|40|50|60" },
++      { "snes9x2002_frameskip_interval", "Frameskip Interval; 1|2|3|4|5|6|7|8|9" },
+       { "snes9x2002_overclock_cycles", "Reduce Slowdown (Hack, Unsafe, Restart); disabled|compatible|max" },
        { NULL, NULL },
     };
 @@ -383,6 +452,14 @@ void retro_deinit(void)
diff --git a/patches/snes9x2002/0002-core-options.patch b/patches/snes9x2002/0002-core-options.patch
deleted file mode 100644
index a908343..0000000
--- a/patches/snes9x2002/0002-core-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libretro/libretro.c b/libretro/libretro.c
-index 81ce4aa..bc64376 100644
---- a/libretro/libretro.c
-+++ b/libretro/libretro.c
-@@ -339,7 +339,7 @@ void retro_init (void)
- {
-    static const struct retro_variable vars[] =
-    {
--      { "snes9x2002_overclock_cycles", "Reduce Slowdown (Hack, Unsafe, Restart); disabled|compatible|max" },
-+      { "snes9x2002_overclock_cycles", "Overclock (Restart); disabled|compatible|max" },
-       { NULL, NULL },
-    };
- 
diff --git a/patches/snes9x2002/0001-trimui-support.patch b/patches/snes9x2002/1000-trimui-support.patch
index 1f7659d..1f7659d 100644
--- a/patches/snes9x2002/0001-trimui-support.patch
+++ b/patches/snes9x2002/1000-trimui-support.patch
diff --git a/patches/snes9x2002/1001-core-options.patch b/patches/snes9x2002/1001-core-options.patch
new file mode 100644
index 0000000..c97185b
--- /dev/null
+++ b/patches/snes9x2002/1001-core-options.patch
@@ -0,0 +1,17 @@
+diff --git a/libretro/libretro.c b/libretro/libretro.c
+index 3c24e8f..b09354a 100644
+--- a/libretro/libretro.c
++++ b/libretro/libretro.c
+@@ -406,9 +406,9 @@ void retro_init (void)
+    static const struct retro_variable vars[] =
+    {
+       { "snes9x2002_frameskip", "Frameskip ; disabled|auto|threshold" },
+-      { "snes9x2002_frameskip_threshold", "Frameskip Threshold (%); 30|40|50|60" },
+-      { "snes9x2002_frameskip_interval", "Frameskip Interval; 1|2|3|4|5|6|7|8|9" },
+-      { "snes9x2002_overclock_cycles", "Reduce Slowdown (Hack, Unsafe, Restart); disabled|compatible|max" },
++      { "snes9x2002_frameskip_threshold", "FS Threshold (%); 30|40|50|60" },
++      { "snes9x2002_frameskip_interval", "FS Interval; 1|2|3|4|5|6|7|8|9" },
++      { "snes9x2002_overclock_cycles", "Overclock (Restart); disabled|compatible|max" },
+       { NULL, NULL },
+    };
+ 
diff --git a/patches/snes9x2005/1000-frameskip-interval.patch b/patches/snes9x2005/0001-frameskip-interval.patch
index eb920c7..0025b76 100644
--- a/patches/snes9x2005/1000-frameskip-interval.patch
+++ b/patches/snes9x2005/0001-frameskip-interval.patch
@@ -59,12 +59,12 @@ index c368d8f..305adee 100644
              IPPU.RenderThisFrame = false;
              frameskip_counter++;
 diff --git a/libretro_core_options.h b/libretro_core_options.h
-index b32864a..b69d19a 100644
+index 032cefd..14bf8d8 100644
 --- a/libretro_core_options.h
 +++ b/libretro_core_options.h
 @@ -71,9 +71,9 @@ struct retro_core_option_definition option_defs_us[] = {
        "Frameskip",
-       "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+       "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Manual' utilises the 'Frameskip Threshold (%)' setting.",
        {
 -         { "disabled", NULL },
 -         { "auto",     "Auto" },
@@ -74,14 +74,14 @@ index b32864a..b69d19a 100644
 +         { "auto_threshold", "Threshold" },
           { NULL, NULL },
        },
-       "auto"
+       "disabled"
 @@ -103,6 +103,26 @@ struct retro_core_option_definition option_defs_us[] = {
        },
        "33"
     },
 +   {
 +      "catsfc_frameskip_interval",
-+      "FS Interval",
++      "Frameskip Interval",
 +      "The maximum number of frames that can be skipped before a new frame is rendered.",
 +      {
 +         { "0",  NULL },
@@ -101,4 +101,4 @@ index b32864a..b69d19a 100644
 +   },
     {
        "catsfc_overclock_cycles",
-       "Overclock (Restart)",
+       "Reduce Slowdown (Hack, Unsafe, Restart)",
diff --git a/patches/snes9x2005/0001-trimui-support.patch b/patches/snes9x2005/1000-trimui-support.patch
index 9424312..9424312 100644
--- a/patches/snes9x2005/0001-trimui-support.patch
+++ b/patches/snes9x2005/1000-trimui-support.patch
diff --git a/patches/snes9x2005/0002-core-options.patch b/patches/snes9x2005/1001-core-options.patch
index 7f43e83..47a419c 100644
--- a/patches/snes9x2005/0002-core-options.patch
+++ b/patches/snes9x2005/1001-core-options.patch
@@ -1,5 +1,5 @@
 diff --git a/libretro_core_options.h b/libretro_core_options.h
-index 032cefd..b32864a 100644
+index 14bf8d8..b69d19a 100644
 --- a/libretro_core_options.h
 +++ b/libretro_core_options.h
 @@ -57,7 +57,7 @@ struct retro_core_option_definition option_defs_us[] = {
@@ -18,9 +18,9 @@ index 032cefd..b32864a 100644
 -      "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Manual' utilises the 'Frameskip Threshold (%)' setting.",
 +      "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
        {
-          { "disabled", NULL },
-          { "auto",     "Auto" },
-          { "manual",   "Manual" },
+          { "disabled",       NULL },
+          { "auto",           "Auto" },
+          { "auto_threshold", "Threshold" },
           { NULL, NULL },
        },
 -      "disabled"
@@ -35,7 +35,16 @@ index 032cefd..b32864a 100644
        {
           { "15", NULL },
           { "18", NULL },
-@@ -105,8 +105,8 @@ struct retro_core_option_definition option_defs_us[] = {
+@@ -105,7 +105,7 @@ struct retro_core_option_definition option_defs_us[] = {
+    },
+    {
+       "catsfc_frameskip_interval",
+-      "Frameskip Interval",
++      "FS Interval",
+       "The maximum number of frames that can be skipped before a new frame is rendered.",
+       {
+          { "0",  NULL },
+@@ -125,8 +125,8 @@ struct retro_core_option_definition option_defs_us[] = {
     },
     {
        "catsfc_overclock_cycles",
@@ -46,7 +55,7 @@ index 032cefd..b32864a 100644
        {
           { "disabled",   NULL },
           { "compatible", "Compatible" },
-@@ -117,7 +117,7 @@ struct retro_core_option_definition option_defs_us[] = {
+@@ -137,7 +137,7 @@ struct retro_core_option_definition option_defs_us[] = {
     },
     {
        "catsfc_reduce_sprite_flicker",