- up to 0.181

diff --git a/mame-c++11.patch b/mame-c++11.patch
deleted file mode 100644 (file)
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 {\r
- --                                    "-D__USE_MINGW_ANSI_STDIO=1", -- required or lua won't compile linux ignores this but Windows needs it\r
-                                       "-freport-bug",\r
--                                      "-D_GLIBCXX_USE_CXX11_ABI=0", -- does not seem to matter in linux, mingw needs to link printf,etc\r
- --                                    "-DNO_MEM_TRACKING",          -- must comment out for mingw GCC 5.2 pedantic or get new/delete redef error\r
- -- next two should work, but compiler complains about end conditions that are int when loop variable is unsigned. maybe these can be fixed\r
- --                                    "-funsafe-loop-optimizations",\r

diff --git a/mame-system-jsoncpp.patch b/mame-system-jsoncpp.patch
deleted file mode 100644 (file)
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 @@
- ***************************************************************************/\r
- \r
- #include "mongoose/mongoose.h"\r
--#include "jsoncpp/include/json/json.h"\r
-+#include <jsoncpp/json/json.h>\r
- #include "emu.h"\r
- #include "emuopts.h"\r
- #include "ui/ui.h"\r
---- 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\r
- --------------------------------------------------\r
- \r
-+if _OPTIONS["with-bundled-jsoncpp"] then\r
- project "jsoncpp"\r
-       uuid "ae023ff3-d712-4e54-adc5-3b56a148650f"\r
-       kind "StaticLib"\r
-@@ -458,6 +459,11 @@
-                       "-Wshadow"\r
-               }\r
-       end\r
-+else\r
-+links {\r
-+      "jsoncpp",\r
-+}\r
-+end\r
- \r
- --------------------------------------------------\r
- -- SQLite3 library objects\r

diff --git a/mame.spec b/mame.spec
index 096588946828cbaefbd1569ac340e71f6dd17d56..cd0c9cef3cc1b0df4cab667817bba57d6fd9ace4 100644 (file)
--- 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
 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
 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
 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
 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
 
 
 %{__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)
 
 %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
 %attr(755,root,root) %{_bindir}/mame