summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2018-12-08 23:14:22 +0000
committerwiz <wiz@pkgsrc.org>2018-12-08 23:14:22 +0000
commitaf9fbc763e00eaec6d1bb6277b96a87d06c0654c (patch)
treec33a21b20244fff05f2181dd9916b791707b92bb
parent23c1bd9babd35eab01e0a505436bd60d2dd7f6d0 (diff)
downloadpkgsrc-af9fbc763e00eaec6d1bb6277b96a87d06c0654c.tar.gz
mame: remove unneeded patches
0.204 still compiles without them.
-rw-r--r--emulators/mame/distinfo4
-rw-r--r--emulators/mame/patches/patch-src_devices_cpu_mips_mips3.cpp24
-rw-r--r--emulators/mame/patches/patch-src_devices_cpu_mips_ps2vif1.cpp13
3 files changed, 1 insertions, 40 deletions
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 2b04f7393c3..8b1cb864c6a 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2018/12/07 22:09:16 wiz Exp $
+$NetBSD: distinfo,v 1.76 2018/12/08 23:14:22 wiz Exp $
SHA1 (mame-0.204.tar.gz) = 770f600c4c83793ffade1fae471df9e0a8087300
RMD160 (mame-0.204.tar.gz) = 9a17f89b8fc34fbe26885f47ecc9de282e4fff1c
@@ -13,6 +13,4 @@ SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = be6413d6cd277ad4d7b5
SHA1 (patch-makefile) = 2e9092a2eba3db8b9a33a1d22f8410d7ab965a87
SHA1 (patch-scripts_genie.lua) = 91940dbcf30e0abd25167a79b53deb43a18daf86
SHA1 (patch-scripts_toolchain.lua) = 6227e19645ce1f632401629bc9c988736e5e1ba7
-SHA1 (patch-src_devices_cpu_mips_mips3.cpp) = 64de7e132051d7b55bd1b9ae1cf0b5bbc826dc33
-SHA1 (patch-src_devices_cpu_mips_ps2vif1.cpp) = dffb66d3fd7579b285684ece4c819fd29722d920
SHA1 (patch-src_mame_video_xavix.cpp) = 3791a7937488bd134a3607616e5483f0d30b96f8
diff --git a/emulators/mame/patches/patch-src_devices_cpu_mips_mips3.cpp b/emulators/mame/patches/patch-src_devices_cpu_mips_mips3.cpp
deleted file mode 100644
index 7d2d931a47d..00000000000
--- a/emulators/mame/patches/patch-src_devices_cpu_mips_mips3.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_devices_cpu_mips_mips3.cpp,v 1.1 2018/07/25 14:05:53 wiz Exp $
-
-Fix namespace problems.
-
---- src/devices/cpu/mips/mips3.cpp.orig 2018-07-24 19:45:05.000000000 +0000
-+++ src/devices/cpu/mips/mips3.cpp
-@@ -3053,7 +3053,7 @@ void r5900le_device::handle_extra_cop2(u
- {
- if (BIT(op, 24-field))
- {
-- fd[field] = std::fmax(fs[field], ft[bc]);
-+ fd[field] = ::fmax(fs[field], ft[bc]);
- }
- }
- }
-@@ -3069,7 +3069,7 @@ void r5900le_device::handle_extra_cop2(u
- {
- if (BIT(op, 24-field))
- {
-- fd[field] = std::fmin(fs[field], ft[bc]);
-+ fd[field] = ::fmin(fs[field], ft[bc]);
- }
- }
- }
diff --git a/emulators/mame/patches/patch-src_devices_cpu_mips_ps2vif1.cpp b/emulators/mame/patches/patch-src_devices_cpu_mips_ps2vif1.cpp
deleted file mode 100644
index 4f5041cc643..00000000000
--- a/emulators/mame/patches/patch-src_devices_cpu_mips_ps2vif1.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_devices_cpu_mips_ps2vif1.cpp,v 1.1 2018/07/25 14:05:53 wiz Exp $
-
-Fix namespace problems.
-
---- src/devices/cpu/mips/ps2vif1.cpp.orig 2018-07-24 19:45:05.000000000 +0000
-+++ src/devices/cpu/mips/ps2vif1.cpp
-@@ -622,5 +622,5 @@ uint32_t ps2_vif1_device::calculate_unpa
- num = cl * (num / wl) + ((mod > cl) ? cl : mod);
- }
-
-- return (uint32_t)std::ceil(((32 >> vl) * (vn + 1) * num) / 32.0f);
-+ return (uint32_t)::ceil(((32 >> vl) * (vn + 1) * num) / 32.0f);
- }