From 5dda5626277afe24c53d2765a85ed4bcc17f5405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 27 Feb 2019 21:54:29 +0100
Subject: [PATCH] mame: upgrade 0206 -> 0207
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* use upstream logo
* 0001-Show-video-mode-option-accel-in-help-and-GUI.patch was applied upstream

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...eo-mode-option-accel-in-help-and-GUI.patch | 32 ---------
 ...e-optimization-by-not-using-modulus.patch} |  0
 recipes-emulators/mame/mame/MAMElogo.svg      | 68 -------------------
 .../mame/{mame_0206.bb => mame_0207.bb}       | 10 ++-
 4 files changed, 4 insertions(+), 106 deletions(-)
 delete mode 100644 recipes-emulators/mame/mame/0001-Show-video-mode-option-accel-in-help-and-GUI.patch
 rename recipes-emulators/mame/mame/{0002-pokey-performance-optimization-by-not-using-modulus.patch => 0001-pokey-performance-optimization-by-not-using-modulus.patch} (100%)
 delete mode 100644 recipes-emulators/mame/mame/MAMElogo.svg
 rename recipes-emulators/mame/{mame_0206.bb => mame_0207.bb} (94%)

diff --git a/recipes-emulators/mame/mame/0001-Show-video-mode-option-accel-in-help-and-GUI.patch b/recipes-emulators/mame/mame/0001-Show-video-mode-option-accel-in-help-and-GUI.patch
deleted file mode 100644
index 1fdeda3..0000000
--- a/recipes-emulators/mame/mame/0001-Show-video-mode-option-accel-in-help-and-GUI.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 549674e69e467004a3e2366d2cd3d08071832ccc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 13 Feb 2019 22:30:09 +0100
-Subject: [PATCH] Show video-mode option 'accel' in help and GUI
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/mamedev/mame/pull/4650
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/osd/sdl/sdlmain.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
-index f7d80a1048..37d1434a2e 100644
---- a/src/osd/sdl/sdlmain.cpp
-+++ b/src/osd/sdl/sdlmain.cpp
-@@ -375,6 +375,7 @@ static void osd_sdl_info(void)
- void sdl_osd_interface::video_register()
- {
- 	video_options_add("soft", nullptr);
-+	video_options_add("accel", nullptr);
- #if USE_OPENGL
- 	video_options_add("opengl", nullptr);
- #endif
--- 
-2.20.1
-
diff --git a/recipes-emulators/mame/mame/0002-pokey-performance-optimization-by-not-using-modulus.patch b/recipes-emulators/mame/mame/0001-pokey-performance-optimization-by-not-using-modulus.patch
similarity index 100%
rename from recipes-emulators/mame/mame/0002-pokey-performance-optimization-by-not-using-modulus.patch
rename to recipes-emulators/mame/mame/0001-pokey-performance-optimization-by-not-using-modulus.patch
diff --git a/recipes-emulators/mame/mame/MAMElogo.svg b/recipes-emulators/mame/mame/MAMElogo.svg
deleted file mode 100644
index b45bc7e..0000000
--- a/recipes-emulators/mame/mame/MAMElogo.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg4563"
-   version="1.1"
-   viewBox="0 0 321.26581 91.07238"
-   height="91.07238mm"
-   width="321.26581mm">
-  <defs
-     id="defs4557">
-    <linearGradient
-       id="left-dark">
-      <stop
-         style="stop-color:#00274f;stop-opacity:1"
-         offset="0"
-         id="stop5213" />
-      <stop
-         style="stop-color:#68cafb;stop-opacity:1"
-         offset="1"
-         id="stop5215" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="299.328"
-       x2="11"
-       y1="299.328"
-       x1="1213.16"
-       id="right-dark">
-      <stop
-         id="stop4"
-         stop-color="#68cafb"
-         offset="0" />
-      <stop
-         id="stop6"
-         stop-color="#00274f"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="162.44048"
-       x2="237.65611"
-       y1="162.44048"
-       x1="-80.41803"
-       id="linearGradient5175"
-       xlink:href="#right-dark" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="162.44048"
-       x2="237.65611"
-       y1="162.44048"
-       x1="-80.41803"
-       id="linearGradient5211"
-       xlink:href="#left-dark" />
-  </defs>
-  <g
-     transform="translate(82.012688,-116.4355)"
-     id="layer1">
-    <path
-       style="fill:url(#linearGradient5175);fill-rule:evenodd;stroke:url(#linearGradient5211);stroke-width:1.32291663px;stroke-linejoin:miter;stroke-opacity:0.75"
-       d="m -80.418029,184.88601 66.4546,-66.5869 v 28.92769 l 29.05998,-28.92769 v 46.56667 l 46.74315,-46.83125 v 52.51979 l 52.519789,-52.51979 v 29.19227 l 29.01579,-28.92769 v 44.6704 l 43.56815,-43.65625 h 50.71269 l -16.36184,16.36025 h -25.83921 l -7.40833,7.40833 h 13.44877 l -17.02064,17.24184 h -13.80332 l -7.67291,7.54062 h 44.93418 l -17.15293,17.02171 h -68.74748 l 4.14496,-4.54211 V 161.91118 L 101.6153,186.07663 V 158.0308 L 74.715911,184.88601 H 44.421121 V 162.17576 L -0.24927857,206.84642 H -26.707609 L -2.1013586,182.1518 V 162.17576 L -26.707609,186.6058 v -29.10417 l -27.25209,27.38438 z"
-       class="cls-1" />
-  </g>
-</svg>
diff --git a/recipes-emulators/mame/mame_0206.bb b/recipes-emulators/mame/mame_0207.bb
similarity index 94%
rename from recipes-emulators/mame/mame_0206.bb
rename to recipes-emulators/mame/mame_0207.bb
index 1ffcbe5..0fa651b 100644
--- a/recipes-emulators/mame/mame_0206.bb
+++ b/recipes-emulators/mame/mame_0207.bb
@@ -6,13 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=798620970c471a3a6b7b5e9c9192fe12"
 
 SRC_URI = " \
     https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
-    file://0001-Show-video-mode-option-accel-in-help-and-GUI.patch \
-    file://0002-pokey-performance-optimization-by-not-using-modulus.patch \
+    file://0001-pokey-performance-optimization-by-not-using-modulus.patch \
     file://mame.desktop \
-    file://MAMElogo.svg \
 "
-SRC_URI[md5sum] = "b20e4edb93b1e81802b2b23688ad87ca"
-SRC_URI[sha256sum] = "588ba357361cc49fdc2754d8343c8b91f6b965b30220a998cbb1da09e49dcbdd"
+SRC_URI[md5sum] = "7a368efb80c228258d1928ed74bbc7a4"
+SRC_URI[sha256sum] = "69c29533d2128345c59fbf23fabc3af696322a77a6c1d7a7bd7f5a2ee57adafb"
 
 S = "${WORKDIR}/${BPN}-${BPN}${PV}"
 
@@ -197,7 +195,7 @@ EOF
 
     # Logo
     install -d ${D}${datadir}/pixmaps
-    install -m 644 ${WORKDIR}/MAMElogo.svg ${D}${datadir}/pixmaps
+    install -m 644 ${S}/docs/source/images/MAMElogo.svg ${D}${datadir}/pixmaps
 
     # cleanup
     find ${D}${datadir}/${BPN} -name LICENSE -exec rm {} \;