From eaad617fc82d630c36244c74312d9e5fba2621c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 30 Apr 2016 01:21:24 +0200
Subject: [PATCH] mame: update to 0173
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...fig-for-finding-sdl-library-settings.patch | 80 +++++++++----------
 .../mame/{mame_0171.bb => mame_0173.bb}       | 15 ++--
 2 files changed, 43 insertions(+), 52 deletions(-)
 rename recipes-emulators/mame/{mame_0171.bb => mame_0173.bb} (81%)

diff --git a/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch b/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
index 4ab810f..119d27c 100644
--- a/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
+++ b/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
@@ -9,52 +9,53 @@ Content-Transfer-Encoding: 8bit
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  scripts/src/osd/sdl.lua     | 6 +++---
- scripts/src/osd/sdl_cfg.lua | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ scripts/src/osd/sdl_cfg.lua | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
-index 76947ad..9b6b54d 100644
+index d1a8322..32ca84a 100644
 --- a/scripts/src/osd/sdl.lua
 +++ b/scripts/src/osd/sdl.lua
-@@ -68,7 +68,7 @@ function maintargetosdoptions(_target,_subtarget)
+@@ -78,7 +78,7 @@ function maintargetosdoptions(_target,_subtarget)
+ 					}
+ 				configuration { }
+ 			else
+-				local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
++				local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
+ 				addlibfromstring(str)
+ 				addoptionsfromstring(str)
+ 			end
+@@ -280,7 +280,7 @@ if BASE_TARGETOS=="unix" then
+ 					"SDL2.framework",
  				}
- 			configuration { }
+ 			else
+-				local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
++				local str = backtick("pkg-config --libs --static sdl2 | sed 's/-lSDLmain//'")
+ 				addlibfromstring(str)
+ 				addoptionsfromstring(str)
+ 			end
+@@ -300,7 +300,7 @@ if BASE_TARGETOS=="unix" then
+ 				"SDL2",
+ 			}
  		else
--			local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
-+			local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
+-			local str = backtick(sdlconfigcmd() .. " --libs")
++			local str = backtick("pkg-config --libs sdl2")
  			addlibfromstring(str)
  			addoptionsfromstring(str)
  		end
-@@ -256,7 +256,7 @@ if BASE_TARGETOS=="unix" then
- 				"SDL2.framework",
- 			}
- 		else
--			local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
-+			local str = backtick("pkg-config --libs --static sdl2 | sed 's/-lSDLmain//'")
- 			addlibfromstring(str)
- 			addoptionsfromstring(str)
- 		end
-@@ -270,7 +270,7 @@ if BASE_TARGETOS=="unix" then
- 				"/usr/openwin/lib",
- 			}
- 		end
--		local str = backtick(sdlconfigcmd() .. " --libs")
-+		local str = backtick("pkg-config --libs sdl2")
- 		addlibfromstring(str)
- 		addoptionsfromstring(str)
- 		if _OPTIONS["targetos"]~="haiku" then
 diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
-index e3a6f91..f88394e 100644
+index 0fd15e5..839a468 100644
 --- a/scripts/src/osd/sdl_cfg.lua
 +++ b/scripts/src/osd/sdl_cfg.lua
-@@ -84,12 +84,12 @@ if BASE_TARGETOS=="unix" then
- 				"MACOSX_USE_LIBSDL",
- 			}
- 			buildoptions {
--				backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
-+				backtick("pkg-config --cflags sdl2 | sed 's:/SDL::'"),
- 			}
- 		end
+@@ -84,13 +84,13 @@ if BASE_TARGETOS=="unix" then
+ 					"MACOSX_USE_LIBSDL",
+ 				}
+ 				buildoptions {
+-					backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
++					backtick("pkg-config --cflags sdl2 | sed 's:/SDL::'"),
+ 				}
+ 			end
+ 			end
  	else
  		buildoptions {
 -			backtick(sdlconfigcmd() .. " --cflags"),
@@ -62,15 +63,6 @@ index e3a6f91..f88394e 100644
  		}
  		if _OPTIONS["targetos"]~="asmjs" then
  			buildoptions {
-@@ -142,7 +142,7 @@ elseif _OPTIONS["targetos"]=="os2" then
- 		"SDLMAME_OS2",
- 	}
- 	buildoptions {
--		backtick(sdlconfigcmd() .. " --cflags"),
-+		backtick("pkg-config --cflags sdl2"),
- 	}
- end
- 
 -- 
-2.5.0
+2.5.5
 
diff --git a/recipes-emulators/mame/mame_0171.bb b/recipes-emulators/mame/mame_0173.bb
similarity index 81%
rename from recipes-emulators/mame/mame_0171.bb
rename to recipes-emulators/mame/mame_0173.bb
index ed02cc4..76dd93a 100644
--- a/recipes-emulators/mame/mame_0171.bb
+++ b/recipes-emulators/mame/mame_0173.bb
@@ -1,16 +1,16 @@
 SUMMARY = "Multiple Arcade Machine Emulator"
 HOMEPAGE = "http://www.mamedev.org/index.php" 
 
-LICENSE = "MAME"
-LIC_FILES_CHKSUM = "file://docs/mamelicense.txt;md5=f40fdf5d5756f220c8e44004f2ef48dc" 
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=89436197a991695e278e47475b4ff7ae" 
 
 SRC_URI = " \
     https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
     file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
     file://0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch \
 "
-SRC_URI[md5sum] = "4b21d52df5f826de756a4c80975bd414"
-SRC_URI[sha256sum] = "e543316e238b02ae80f8de6e1da3eaaac3754bc8370deb7c31a4bc73121763c5"
+SRC_URI[md5sum] = "0113caa215641610903d0c1567419a70"
+SRC_URI[sha256sum] = "499172e28eb53f30b3036a036c3834f0a865d5505f7234aebd49145358621654"
 
 S = "${WORKDIR}/${BPN}-${BPN}${PV}"
 
@@ -66,12 +66,11 @@ do_install() {
         jedutil \
         ldresample \
         ldverify \
+        mame \
         nltool \
-        nlwav \
-        pngcmp \
+        romcmp \
         split \
-        srcclean \
-        testkeys \
+        src2html \
         unidasm \
         ; \
     do