[gnome-games] flatpak: Unpin PCSX-ReARMed commit and carry a patch instead

[Adrien Plazas <aplazas src gnome org>]

commit 3fadc06ce427fb98438e95bde9d08862afee9050
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Tue Jun 26 19:09:43 2018 +0500

    flatpak: Unpin PCSX-ReARMed commit and carry a patch instead
    
    PCSX-ReARMed has dropped submodules that have caused false failures in
    CI. Let's switch to master and revert pcsx_rearmed commit
    53e4a7e5cb46ad8589825ec95e15b56614cc54d9 until that problem is fixed
    instead.
    
    Reverts commits 7e018bda9e42ca4ce93e19b3997e50efa9cc06de and
    c48d4cdbcde84644eb9bad3af57e688a0f878ef6
    
    See commit 7e018bda9e42ca4ce93e19b3997e50efa9cc06de for more info.

 flatpak/libretro-cores/libretro-pcsx_rearmed.json  |  7 ++--
 ...sx_rearmed-Remove-reset-in-retro_run-hack.patch | 42 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/flatpak/libretro-cores/libretro-pcsx_rearmed.json 
b/flatpak/libretro-cores/libretro-pcsx_rearmed.json
index 504557e..6505deb 100644
--- a/flatpak/libretro-cores/libretro-pcsx_rearmed.json
+++ b/flatpak/libretro-cores/libretro-pcsx_rearmed.json
@@ -18,8 +18,11 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/libretro/pcsx_rearmed";,
-                    "branch": "511848c9da1829102e9107ca06e2a06a2f7982eb"
+                    "url": "https://github.com/libretro/pcsx_rearmed";
+                },
+                {
+                    "type": "patch",
+                    "path": "pcsx_rearmed-Remove-reset-in-retro_run-hack.patch"
                 },
                 {
                     "type": "file",
diff --git a/flatpak/libretro-cores/pcsx_rearmed-Remove-reset-in-retro_run-hack.patch 
b/flatpak/libretro-cores/pcsx_rearmed-Remove-reset-in-retro_run-hack.patch
new file mode 100644
index 0000000..34c873f
--- /dev/null
+++ b/flatpak/libretro-cores/pcsx_rearmed-Remove-reset-in-retro_run-hack.patch
@@ -0,0 +1,42 @@
+From 24c756314d63a5653b36df88563d316f5ed6c9b7 Mon Sep 17 00:00:00 2001
+From: Adrien Plazas <kekun plazas laposte net>
+Date: Fri, 10 Mar 2017 07:24:33 +0100
+Subject: [PATCH] libretro: Remove reset in retro_run() hack
+
+Removes a hack breaking deserialization when running retro_reset(),
+retro_unserialize() and retro_run() in this order, as it silently resets
+the core just after setting its state.
+---
+ frontend/libretro.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/frontend/libretro.c b/frontend/libretro.c
+index 708e497..a84b891 100644
+--- a/frontend/libretro.c
++++ b/frontend/libretro.c
+@@ -1299,9 +1299,7 @@ size_t retro_get_memory_size(unsigned id)
+ 
+ void retro_reset(void)
+ {
+-   //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key
+-   rebootemu = 1;
+-      //SysReset();
++      SysReset();
+ }
+ 
+ static const unsigned short retro_psx_map[] = {
+@@ -1535,11 +1533,6 @@ static void update_variables(bool in_flight)
+ void retro_run(void)
+ {
+     int i;
+-    //SysReset must be run while core is running,Not in menu (Locks up Retroarch)
+-    if(rebootemu != 0){
+-      rebootemu = 0;
+-      SysReset();
+-    }
+ 
+       input_poll_cb();
+ 
+-- 
+2.17.1
+