[mame] 01/02: Add patch to fix compile on several architectures.

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame.

commit db40716fbd5b60e98b2b0df6a485eb5f79bd2a10
Author: Jordi Mallach <jordi at debian.org>
Date:   Fri May 13 00:21:42 2016 +0200

    Add patch to fix compile on several architectures.
---
 debian/changelog                           |  7 +++++
 debian/patches/ftbfs_v60_m_fetch_xor.patch | 47 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 91440e7..86b1b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mame (0.173-2) UNRELEASED; urgency=medium
+
+  * Add ftbfs_v60_m_fetch_xor.patch: cherrypick from git to fix a compile
+    error on several Debian architectures.
+
+ -- Jordi Mallach <jordi at debian.org>  Fri, 13 May 2016 00:15:16 +0200
+
 mame (0.173-1) unstable; urgency=medium
 
   [ Cesare Falco ]
diff --git a/debian/patches/ftbfs_v60_m_fetch_xor.patch b/debian/patches/ftbfs_v60_m_fetch_xor.patch
new file mode 100644
index 0000000..ca0aae9
--- /dev/null
+++ b/debian/patches/ftbfs_v60_m_fetch_xor.patch
@@ -0,0 +1,47 @@
+commit c133569132c8537107aee793d0a97007ca6a1464
+Author: hap <happppp at users.noreply.github.com>
+Date:   Wed May 11 14:34:48 2016 +0200
+
+    v60: revert clang compile warning fix that broke conditional compile, added var to save_item to prevent that warning
+
+diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
+index 0a20284..ec33e3e 100644
+--- a/src/devices/cpu/v60/v60.cpp
++++ b/src/devices/cpu/v60/v60.cpp
+@@ -85,6 +85,7 @@ v60_device::v60_device(const machine_config &mconfig, const char *tag, device_t
+ 	: cpu_device(mconfig, V60, "V60", tag, owner, clock, "v60", __FILE__)
+ 	, m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0)
+ 	, m_io_config("io", ENDIANNESS_LITTLE, 16, 24, 0)
++	, m_fetch_xor(BYTE_XOR_LE(0))
+ 	, m_start_pc(0xfffff0)
+ {
+ 	// Set m_PIR (Processor ID) for NEC m_ LSB is reserved to NEC,
+@@ -97,6 +98,7 @@ v60_device::v60_device(const machine_config &mconfig, device_type type, const ch
+ 	: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
+ 	, m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0)
+ 	, m_io_config("io", ENDIANNESS_LITTLE, 16, 24, 0)
++	, m_fetch_xor(BYTE4_XOR_LE(0))
+ 	, m_start_pc(0xfffffff0)
+ {
+ 	// Set m_PIR (Processor ID) for NEC v70. LSB is reserved to NEC,
+@@ -426,6 +428,7 @@ void v60_device::device_start()
+ 	m_direct = &m_program->direct();
+ 	m_io = &space(AS_IO);
+ 
++	save_item(NAME(m_fetch_xor));
+ 	save_item(NAME(m_reg));
+ 	save_item(NAME(m_irq_line));
+ 	save_item(NAME(m_nmi_line));
+diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h
+index a7b2c88..acb1c70 100644
+--- a/src/devices/cpu/v60/v60.h
++++ b/src/devices/cpu/v60/v60.h
+@@ -151,6 +151,7 @@ private:
+ 	address_space_config m_program_config;
+ 	address_space_config m_io_config;
+ 
++	offs_t              m_fetch_xor;
+ 	offs_t              m_start_pc;
+ 	UINT32              m_reg[68];
+ 	struct {
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..398c9c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ftbfs_v60_m_fetch_xor.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git