diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-09-29 15:25:13 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-09-29 15:25:13 +0200 |
| commit | 512c1696665fba8e6ba189dd9dc2a192cc08a1df (patch) | |
| tree | eef3664fab9c6df607a0e76b8f963480938686c3 /gnu/packages | |
| parent | a7997033fa5635ae83d5671b6bb4c80bc3289c18 (diff) | |
| download | guix-patches-512c1696665fba8e6ba189dd9dc2a192cc08a1df.tar guix-patches-512c1696665fba8e6ba189dd9dc2a192cc08a1df.tar.gz | |
gnu: mame: Update to 0.214.
* gnu/packages/emulators.scm (mame): Update to 0.214.
[source]: Remove unnecessary patch.
* gnu/packages/patches/mame-rapidjson-fix.patch: Delete file.
* gnu/local.mk: Remove reference to deleted patch.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/emulators.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/mame-rapidjson-fix.patch | 37 |
2 files changed, 2 insertions, 43 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c6eda97473..38468cfc8d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1189,7 +1189,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.212") + (version "0.214") (source (origin (method git-fetch) @@ -1199,11 +1199,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c")) - (patches - ;; FIXME: Remove once 0.213 is out. Applied upstream as - ;; 0b5b13cf1e28550b49c387dec93f9801f029e313. - (search-patches "mame-rapidjson-fix.patch")) + "129yk3ybcviscy2xk1mkkzxm4h4nh5p6ndfgqbmcx547p1s6hbja")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. diff --git a/gnu/packages/patches/mame-rapidjson-fix.patch b/gnu/packages/patches/mame-rapidjson-fix.patch deleted file mode 100644 index 70cf8458ea..0000000000 --- a/gnu/packages/patches/mame-rapidjson-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001 -From: Julian Sikorski <belegdol+github@gmail.com> -Date: Mon, 5 Aug 2019 21:16:54 +0200 -Subject: [PATCH] Fix building using system rapidjson - ---- - scripts/target/mame/arcade.lua | 1 + - src/mame/video/midtunit.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua -index 964daa3572f..ef30ae3c2c2 100644 ---- a/scripts/target/mame/arcade.lua -+++ b/scripts/target/mame/arcade.lua -@@ -930,6 +930,7 @@ function createMAMEProjects(_target, _subtarget, _name) - ext_includedir("flac"), - ext_includedir("glm"), - ext_includedir("jpeg"), -+ ext_includedir("rapidjson"), - } - - end -diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp -index b4cb98abacf..b307f3f722b 100644 ---- a/src/mame/video/midtunit.cpp -+++ b/src/mame/video/midtunit.cpp -@@ -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 <rapidjson/prettywriter.h> // Used by JSON logging -+#include <rapidjson/stringbuffer.h> // 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") |