ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mame: Update to 0.214.

Browse source 
* 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.
This commit is contained in:
Nicolas Goaziou 2019-09-29 15:25:13 +02:00
parent a7997033fa
commit 512c169666
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
3 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1091,7 +1091,6 @@ 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 \

8
gnu/packages/emulators.scm
View file

@ -1189,7 +1189,7 @@ (define-public scummvm
(define-public mame
(package
(name "mame")
(version "0.212")
(version "0.214")
(source
(origin
(method git-fetch)
@ -1199,11 +1199,7 @@ (define-public mame
(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.

37
gnu/packages/patches/mame-rapidjson-fix.patch
View file

@ -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")