From 260690fc1052e7a3bdabb06b8a921b32f7394ddc Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sep 04 2019 20:15:13 +0000 Subject: Update to 0.213 Drop upstreamed rapidjson patch --- diff --git a/.gitignore b/.gitignore index 848a678..5ba35c9 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,5 @@ /whatsnew_0211.txt /mame0212s.exe /whatsnew_0212.txt +/mame0213s.exe +/whatsnew_0213.txt diff --git a/mame-0.212-system-rapidjson-fix.patch b/mame-0.212-system-rapidjson-fix.patch deleted file mode 100644 index 746a2fa..0000000 --- a/mame-0.212-system-rapidjson-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up mame-0.212/scripts/target/mame/arcade.lua.rapidjson mame-0.212/scripts/target/mame/arcade.lua ---- mame-0.212/scripts/target/mame/arcade.lua.rapidjson 2019-08-05 08:05:10.794526573 +0200 -+++ mame-0.212/scripts/target/mame/arcade.lua 2019-08-05 08:05:42.477509785 +0200 -@@ -929,6 +929,7 @@ function createMAMEProjects(_target, _su - ext_includedir("flac"), - ext_includedir("glm"), - ext_includedir("jpeg"), -+ ext_includedir("rapidjson"), - } - - end -diff -up mame-0.212/src/mame/video/midtunit.cpp.rapidjson mame-0.212/src/mame/video/midtunit.cpp ---- mame-0.212/src/mame/video/midtunit.cpp.rapidjson 2019-08-05 07:45:44.014502236 +0200 -+++ mame-0.212/src/mame/video/midtunit.cpp 2019-08-05 07:46:05.802406165 +0200 -@@ -20,8 +20,8 @@ - #include "emuopts.h" // Used by PNG logging - #include "png.h" // Used by PNG logging - --#include "rapidjson/include/rapidjson/prettywriter.h" // Used by JSON logging --#include "rapidjson/include/rapidjson/stringbuffer.h" // Used by JSON logging -+#include // Used by JSON logging -+#include // Used by JSON logging - - DEFINE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device, "tunitvid", "Midway T-Unit Video") - DEFINE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device, "wunitvid", "Midway W-Unit Video") diff --git a/mame.spec b/mame.spec index bbb6144..70ad555 100644 --- a/mame.spec +++ b/mame.spec @@ -1,7 +1,7 @@ #The debug build is disabled by default, please use # --with debug to override %bcond_with debug -%global baseversion 212 +%global baseversion 213 Name: mame Version: 0.%{baseversion} @@ -22,7 +22,6 @@ Source0: https://github.com/mamedev/%{name}/releases/download/%{name}0%{b Source1: http://mamedev.org/releases/whatsnew_0%{baseversion}.txt Patch0: %{name}-fortify.patch Patch1: %{name}-genie-systemlua.patch -Patch2: %{name}-%{version}-system-rapidjson-fix.patch # %%{arm}: # https://bugzilla.redhat.com/show_bug.cgi?id=1627625 # %%{power64}: @@ -377,6 +376,10 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} \; %changelog +* Wed Sep 04 2019 Julian Sikorski - 0.213-1 +- Update to 0.213 +- Drop upstreamed rapidjson patch + * Sat Aug 03 2019 Julian Sikorski - 0.212-1 - Update to 0.212 diff --git a/sources b/sources index 9044fb3..58318bd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mame0212s.exe) = 91d583ce834dbf3a8a6fb650d8d185d337a204319a4b41b42de26a95d34608713411cfd2f08fd187b545d868b6056aa8aa029cbca1b9436847626638525c5067 -SHA512 (whatsnew_0212.txt) = ad31fb4a969097de79bbd1503c4e5f1d6efbc680efcc4bad14fcd653903993f35eac30391a1976c75e8f7e646ea7a28ec0674b6026eca8734c1016467e18d809 +SHA512 (mame0213s.exe) = 50b450b885581ca616a6ba3f10f34a2540636752e510284f6ed88455507a0c98e97495270df19cf77ce1216e13d97c2592b036a42faaddcd26435487f5595e3a +SHA512 (whatsnew_0213.txt) = a94f609b9d0b96e1ff4bdce48b3dc3708ca695d501287fefd7964b48292871ee48d3a52cb90aa0a549db7a7ffa8384f1b8e3f524e1312bc4baaaf021fd532090