[mame] 01/02: Removed patches now included upstream

[Cesare Falco]

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

cesarefalco-guest pushed a commit to branch master
in repository mame.

commit 94c0b91c21d626e3dee1b024bc23fb88368f9ea4
Author: Cesare Falco <c.falco at ubuntu.com>
Date:   Sat Jun 4 09:46:56 2016 +0200

    Removed patches now included upstream
---
 debian/patches/arch_ppc_fixes.patch        | 24 ---------------
 debian/patches/ftbfs_v60_m_fetch_xor.patch | 47 ------------------------------
 debian/patches/series                      |  2 --
 3 files changed, 73 deletions(-)

diff --git a/debian/patches/arch_ppc_fixes.patch b/debian/patches/arch_ppc_fixes.patch
deleted file mode 100644
index 3f946a4..0000000
--- a/debian/patches/arch_ppc_fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 689c19720ae7854ec50024972ae8ab1232837d15
-Author: Vas Crabb <vas at vastheman.com>
-Date:   Sat May 14 16:50:14 2016 +1000
-
-    Hopefully fix PPC targets
-
-diff --git a/src/emu/video/rgbvmx.h b/src/emu/video/rgbvmx.h
-index f5829c1..95a7d45 100644
---- a/src/emu/video/rgbvmx.h
-+++ b/src/emu/video/rgbvmx.h
-@@ -28,11 +28,11 @@ protected:
- 	typedef __vector unsigned int   VECU32;
- 
- public:
--	inline rgbaint_t(): VECS8(0), VECU8(0), VECS16(0), VECU16(0), VECS32(0), VECU32(0) { }
-+	inline rgbaint_t() { set(0, 0, 0, 0); }
- 	inline rgbaint_t(UINT32 rgba) { set(rgba); }
- 	inline rgbaint_t(INT32 a, INT32 r, INT32 g, INT32 b) { set(a, r, g, b); }
- 	inline rgbaint_t(rgb_t& rgb) { set(rgb); }
--	inline rgbaint_t(VECS32 rgba): VECS8(0), VECU8(0), VECS16(0), VECU16(0), VECS32(0), VECU32(0) { m_value = rgba; }
-+	inline rgbaint_t(VECS32 rgba) : m_value(rgba) { }
- 
- 	inline void set(rgbaint_t& other) { m_value = other.m_value; }
- 
diff --git a/debian/patches/ftbfs_v60_m_fetch_xor.patch b/debian/patches/ftbfs_v60_m_fetch_xor.patch
deleted file mode 100644
index ca0aae9..0000000
--- a/debian/patches/ftbfs_v60_m_fetch_xor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index e564dca..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-ftbfs_v60_m_fetch_xor.patch
-arch_ppc_fixes.patch

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