From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 22 Jan 2017 13:44:29 +0000 (+0100)
Subject: - up to 0.181
X-Git-Tag: auto/th/mame-0.181-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmame.git;a=commitdiff_plain;h=3b04840

- up to 0.181
---

diff --git a/mame-c++11.patch b/mame-c++11.patch
deleted file mode 100644
index b927129..0000000
--- a/mame-c++11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mame-0.167s/scripts/genie.lua.orig	2015-10-28 09:47:14.000000000 +0100
-+++ mame-0.167s/scripts/genie.lua	2015-11-25 21:54:31.968230955 +0100
-@@ -1041,7 +1041,6 @@
- 				buildoptions {
- --					"-D__USE_MINGW_ANSI_STDIO=1", -- required or lua won't compile linux ignores this but Windows needs it
- 					"-freport-bug",
--					"-D_GLIBCXX_USE_CXX11_ABI=0", -- does not seem to matter in linux, mingw needs to link printf,etc
- --					"-DNO_MEM_TRACKING",          -- must comment out for mingw GCC 5.2 pedantic or get new/delete redef error
- -- next two should work, but compiler complains about end conditions that are int when loop variable is unsigned. maybe these can be fixed
- --					"-funsafe-loop-optimizations",
diff --git a/mame-system-jsoncpp.patch b/mame-system-jsoncpp.patch
deleted file mode 100644
index bfc3385..0000000
--- a/mame-system-jsoncpp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mame-0.167s/src/emu/webengine.c.orig	2015-10-28 09:47:18.000000000 +0100
-+++ mame-0.167s/src/emu/webengine.c	2015-11-03 17:33:54.905526764 +0100
-@@ -9,7 +9,7 @@
- ***************************************************************************/
- 
- #include "mongoose/mongoose.h"
--#include "jsoncpp/include/json/json.h"
-+#include <jsoncpp/json/json.h>
- #include "emu.h"
- #include "emuopts.h"
- #include "ui/ui.h"
---- mame-0.167s/scripts/src/3rdparty.lua.orig	2015-10-28 09:47:14.000000000 +0100
-+++ mame-0.167s/scripts/src/3rdparty.lua	2015-11-03 17:35:43.775522156 +0100
-@@ -435,6 +435,7 @@
- -- jsoncpp library objects
- --------------------------------------------------
- 
-+if _OPTIONS["with-bundled-jsoncpp"] then
- project "jsoncpp"
- 	uuid "ae023ff3-d712-4e54-adc5-3b56a148650f"
- 	kind "StaticLib"
-@@ -458,6 +459,11 @@
- 			"-Wshadow"
- 		}
- 	end
-+else
-+links {
-+	"jsoncpp",
-+}
-+end
- 
- --------------------------------------------------
- -- SQLite3 library objects
diff --git a/mame.spec b/mame.spec
index 0965889..cd0c9ce 100644
--- a/mame.spec
+++ b/mame.spec
@@ -3,15 +3,13 @@
 Summary:	MAME - Multiple Arcade Machine Emulator
 Summary(pl.UTF-8):	MAME (Multiple Arcade Machine Emulator) - emulator wielu automatów do gier
 Name:		mame
-Version:	0.167s
-Release:	2
+Version:	0.181
+Release:	1
 License:	GPL v2+ (BSD for core part, LGPL v2.1+/GPL v2+ for some drivers)
 Group:		X11/Applications/Games
 #Source0Download: http://www.mamedev.org/release.html
-Source0:	http://www.mamedev.org/downloader.php?file=mame0167/%{name}%{fver}.zip
-# Source0-md5:	cb2ab1cac87e6a5187d5c631d58ee3fa
-Patch0:		%{name}-system-jsoncpp.patch
-Patch1:		%{name}-c++11.patch
+Source0:	https://github.com/mamedev/mame/archive/mame%{fver}/%{name}-%{version}.tar.gz
+# Source0-md5:	5a6116932e512b3ddd2fea5906bd7c55
 URL:		http://www.mamedev.org/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL2-devel >= 2
@@ -71,10 +69,7 @@ głównie sprawdzeniu dokładności dokumentacji (bo jak inaczej można
 udowodnić wierne odtworzenie sprzętu?).
 
 %prep
-%setup -q -c
-%{__unzip} -q mame.zip
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{name}%{fver}
 
 %{__sed} -i -e 's/"lua"/"lua5.3"/' scripts/src/main.lua
 
@@ -122,5 +117,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md docs/{SDL,config,floppy,hlsl,imgtool,m6502,mamelicense,newvideo,nscsi}.txt docs/luaengine.md
+%doc README.md
 %attr(755,root,root) %{_bindir}/mame