01/01: gnu: mame: Fix build.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 57939283c0df16cbcec009c442a567ec6e3ff066
Author: Nicolas Goaziou <address@hidden>
Date:   Mon Aug 12 15:39:59 2019 +0200

    gnu: mame: Fix build.
    
    * gnu/packages/emulators.scm (mame): Apply upstream patch.
    * gnu/packages/patches/mame-rapidjson-fix.patch: New file.
    * gnu/local.mk: Register file.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emulators.scm                    |  4 +++
 gnu/packages/patches/mame-rapidjson-fix.patch | 37 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index f412891..fa5753e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1078,6 +1078,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/lxsession-use-gapplication.patch         \
   %D%/packages/patches/make-glibc-compat.patch                 \
   %D%/packages/patches/make-impure-dirs.patch                  \
+  %D%/packages/patches/mame-rapidjson-fix.patch                        \
   %D%/packages/patches/mariadb-client-test-32bit.patch         \
   %D%/packages/patches/mars-install.patch                      \
   %D%/packages/patches/mars-sfml-2.3.patch                     \
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 032ef90..388611d 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1196,6 +1196,10 @@ play them on systems for which they were never 
designed!")
        (sha256
         (base32
          "0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c"))
+       (patches
+       ;; FIXME: Remove once 0.213 is out.  Applied upstream as
+       ;; 0b5b13cf1e28550b49c387dec93f9801f029e313.
+        (search-patches "mame-rapidjson-fix.patch"))
        (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
new file mode 100644
index 0000000..70cf845
--- /dev/null
+++ b/gnu/packages/patches/mame-rapidjson-fix.patch
@@ -0,0 +1,37 @@
+From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001
+From: Julian Sikorski <address@hidden>
+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")