[gnome-games] flatpak: Replace bsnes by bsnes-mercury

[Adrien Plazas <aplazas src gnome org>]

commit ee77f24cf9f317b0c70742c9285dc21eb2233d25
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Thu Aug 2 16:06:40 2018 +0500

    flatpak: Replace bsnes by bsnes-mercury

 ...es_balanced.libretro => bsnes_mercury_balanced.libretro} |   6 +++---
 .../{libretro-bsnes.json => libretro-bsnes-mercury.json}    |   9 ++++-----
 flatpak/org.gnome.Games.UnitTests.json                      |   4 ++--
 flatpak/org.gnome.Games.json                                |   2 +-
 flatpak/tests/bsnes_balanced.240pSuite.expected             |   5 -----
 flatpak/tests/bsnes_balanced.240pSuite.test                 |   9 ---------
 ...ite.120.png => bsnes_mercury_balanced.240pSuite.120.png} | Bin
 flatpak/tests/bsnes_mercury_balanced.240pSuite.expected     |   5 +++++
 flatpak/tests/bsnes_mercury_balanced.240pSuite.test         |   9 +++++++++
 flatpak/tests/test-data.json                                |  12 ++++++------
 10 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/flatpak/libretro-cores/bsnes_balanced.libretro 
b/flatpak/libretro-cores/bsnes_mercury_balanced.libretro
similarity index 63%
rename from flatpak/libretro-cores/bsnes_balanced.libretro
rename to flatpak/libretro-cores/bsnes_mercury_balanced.libretro
index b105c530..8791076a 100644
--- a/flatpak/libretro-cores/bsnes_balanced.libretro
+++ b/flatpak/libretro-cores/bsnes_mercury_balanced.libretro
@@ -1,10 +1,10 @@
 [Libretro]
 Type=Emulator
 Version=1.0
-Name=bsnes Balanced
-Module=bsnes_balanced_libretro.so
+Name=bsnes-mercury Balanced
+Module=bsnes_mercury_balanced_libretro.so
 LibretroVersion=1
-Authors=byuu;
+Authors=byuu;Alcaro;
 License=GPL-3.0;
 
 [Platform:SuperNintendoEntertainmentSystem]
diff --git a/flatpak/libretro-cores/libretro-bsnes.json b/flatpak/libretro-cores/libretro-bsnes-mercury.json
similarity index 70%
rename from flatpak/libretro-cores/libretro-bsnes.json
rename to flatpak/libretro-cores/libretro-bsnes-mercury.json
index c9525074..530cbfef 100644
--- a/flatpak/libretro-cores/libretro-bsnes.json
+++ b/flatpak/libretro-cores/libretro-bsnes-mercury.json
@@ -1,5 +1,5 @@
         {
-            "name": "libretro-bsnes",
+            "name": "libretro-bsnes-mercury",
             "no-autogen": true,
             "make-args": [
                 "prefix=/app",
@@ -14,17 +14,16 @@
             "post-install": [
                 /* TODO: Send that upstream */
                 "mkdir -p /app/lib/libretro/",
-                "install -m644 -p bsnes_balanced.libretro /app/lib/libretro/"
+                "install -m644 -p bsnes_mercury_balanced.libretro /app/lib/libretro/"
             ],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/libretro/bsnes-libretro.git";,
-                    "branch": "libretro"
+                    "url": "https://github.com/libretro/bsnes-mercury.git";
                 },
                 {
                     "type": "file",
-                    "path": "bsnes_balanced.libretro"
+                    "path": "bsnes_mercury_balanced.libretro"
                 }
             ]
         }
diff --git a/flatpak/org.gnome.Games.UnitTests.json b/flatpak/org.gnome.Games.UnitTests.json
index 5c5d7358..c778a6bf 100644
--- a/flatpak/org.gnome.Games.UnitTests.json
+++ b/flatpak/org.gnome.Games.UnitTests.json
@@ -41,7 +41,7 @@
     ],
     "modules" : [
         "libretro-cores/libretro-blastem.json",
-        "libretro-cores/libretro-bsnes.json",
+        "libretro-cores/libretro-bsnes-mercury.json",
         "libretro-cores/libretro-desmume2015.json",
         "libretro-cores/libretro-gambatte.json",
         "libretro-cores/libretro-mednafen_pce_fast.json",
@@ -72,7 +72,7 @@
                     "type" : "script",
                     "commands" : [
                         "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/blastem.240pSuite.test 2>&1 | diff /app/tests/blastem.240pSuite.expected -",
-                        "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/bsnes_balanced.240pSuite.test 2>&1 | diff /app/tests/bsnes_balanced.240pSuite.expected -",
+                        "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/bsnes_mercury_balanced.240pSuite.test 2>&1 | diff 
/app/tests/bsnes_mercury_balanced.240pSuite.expected -",
                         "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/desmume2015.pong-ds.test",
                         "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/gambatte.OpenMAZE.test 2>&1 | diff /app/tests/gambatte.OpenMAZE.expected -",
                         "/app/libexec/installed-tests/retro-gtk-0.14/retro-reftest 
/app/tests/mednafen_pce_fast.240pSuite.test 2>&1 | diff /app/tests/mednafen_pce_fast.240pSuite.expected -",
diff --git a/flatpak/org.gnome.Games.json b/flatpak/org.gnome.Games.json
index 351f60e0..36e42d75 100644
--- a/flatpak/org.gnome.Games.json
+++ b/flatpak/org.gnome.Games.json
@@ -64,7 +64,7 @@
            We build them first, because some of them are very big, and they
            change more rarely than the rest of the modules. */
         "libretro-cores/libretro-blastem.json",
-        "libretro-cores/libretro-bsnes.json",
+        "libretro-cores/libretro-bsnes-mercury.json",
         "libretro-cores/libretro-desmume2015.json",
         "libretro-cores/libretro-dosbox.json",
         "libretro-cores/libretro-gambatte.json",
diff --git a/flatpak/tests/bsnes_balanced.240pSuite.120.png 
b/flatpak/tests/bsnes_mercury_balanced.240pSuite.120.png
similarity index 100%
rename from flatpak/tests/bsnes_balanced.240pSuite.120.png
rename to flatpak/tests/bsnes_mercury_balanced.240pSuite.120.png
diff --git a/flatpak/tests/bsnes_mercury_balanced.240pSuite.expected 
b/flatpak/tests/bsnes_mercury_balanced.240pSuite.expected
new file mode 100644
index 00000000..08fe1d87
--- /dev/null
+++ b/flatpak/tests/bsnes_mercury_balanced.240pSuite.expected
@@ -0,0 +1,5 @@
+/bsnes_mercury_balanced/240pSuite/Boot: OK
+/bsnes_mercury_balanced/240pSuite/Options: OK
+/bsnes_mercury_balanced/240pSuite/120/FastForward: OK
+/bsnes_mercury_balanced/240pSuite/120/Run: OK
+/bsnes_mercury_balanced/240pSuite/120/Video: OK
diff --git a/flatpak/tests/bsnes_mercury_balanced.240pSuite.test 
b/flatpak/tests/bsnes_mercury_balanced.240pSuite.test
new file mode 100644
index 00000000..7b3f908d
--- /dev/null
+++ b/flatpak/tests/bsnes_mercury_balanced.240pSuite.test
@@ -0,0 +1,9 @@
+[Retro Reftest]
+Path=/bsnes_mercury_balanced/240pSuite
+Core=/app/lib/libretro/bsnes_mercury_balanced_libretro.so
+Medias=240pSuite.sfc;
+
+[Options]
+
+[Frame 120]
+Video=bsnes_mercury_balanced.240pSuite.120.png
diff --git a/flatpak/tests/test-data.json b/flatpak/tests/test-data.json
index 49bcbfdb..dd1ef0b8 100644
--- a/flatpak/tests/test-data.json
+++ b/flatpak/tests/test-data.json
@@ -23,18 +23,18 @@
                 },
                 {
                     "type" : "file",
-                    "path" : "bsnes_balanced.240pSuite.120.png",
-                    "dest-filename" : "bsnes_balanced.240pSuite.120.png"
+                    "path" : "bsnes_mercury_balanced.240pSuite.120.png",
+                    "dest-filename" : "bsnes_mercury_balanced.240pSuite.120.png"
                 },
                 {
                     "type" : "file",
-                    "path" : "bsnes_balanced.240pSuite.expected",
-                    "dest-filename" : "bsnes_balanced.240pSuite.expected"
+                    "path" : "bsnes_mercury_balanced.240pSuite.expected",
+                    "dest-filename" : "bsnes_mercury_balanced.240pSuite.expected"
                 },
                 {
                     "type" : "file",
-                    "path" : "bsnes_balanced.240pSuite.test",
-                    "dest-filename" : "bsnes_balanced.240pSuite.test"
+                    "path" : "bsnes_mercury_balanced.240pSuite.test",
+                    "dest-filename" : "bsnes_mercury_balanced.240pSuite.test"
                 },
                 {
                     "type" : "file",