diff --git a/srcpkgs/mame/patches/enable-gcc4.patch b/srcpkgs/mame/patches/enable-gcc4.patch deleted file mode 100644 index 6c10b397e18..00000000000 --- a/srcpkgs/mame/patches/enable-gcc4.patch +++ /dev/null @@ -1,17 +0,0 @@ -With some patches removing c++14 stuff, our gcc-4.9.4 can still -be used to compile MAME. It's about time we get gcc-5.4.0 ready -for Void Linux. - ---- scripts/genie.lua 2016-08-31 03:47:01.000000000 +0200 -+++ scripts/genie.lua 2016-08-31 07:53:29.475819768 +0200 -@@ -970,8 +970,8 @@ - } - end - else -- if (version < 50000) then -- print("GCC version 5.0 or later needed") -+ if (version < 40900) then -+ print("GCC version 4.9 or later needed") - os.exit(-1) - end - buildoptions { diff --git a/srcpkgs/mame/patches/fix-std_istream_swap.patch b/srcpkgs/mame/patches/fix-std_istream_swap.patch deleted file mode 100644 index bfaf638dce7..00000000000 --- a/srcpkgs/mame/patches/fix-std_istream_swap.patch +++ /dev/null @@ -1,66 +0,0 @@ -The template swap() implementation does not compile with gcc-4.9.4, -but fortunately it is not yet used anywhere in the code, thus just -rip it out. - ---- src/lib/util/vecstream.h 2016-08-31 03:47:01.000000000 +0200 -+++ src/lib/util/vecstream.h 2016-08-31 08:46:11.374477157 +0200 -@@ -107,15 +107,6 @@ - setup(); - } - -- void swap(basic_vectorbuf &that) -- { -- using std::swap; -- std::basic_streambuf::swap(that); -- swap(m_mode, that.m_mode); -- swap(m_storage, that.m_storage); -- swap(m_threshold, that.m_threshold); -- } -- - void reserve(typename vector_type::size_type size) - { - if ((m_mode & std::ios_base::out) && (m_storage.capacity() < size)) -@@ -327,8 +318,6 @@ - void vec(const vector_type &content) { rdbuf()->vec(content); } - void vec(vector_type &&content) { rdbuf()->vec(std::move(content)); } - -- void swap(basic_ivectorstream &that) { std::basic_istream::swap(that); rdbuf()->swap(*that.rdbuf()); } -- - private: - basic_vectorbuf m_rdbuf; - }; -@@ -350,8 +339,6 @@ - void vec(vector_type &&content) { rdbuf()->vec(std::move(content)); } - basic_ovectorstream &reserve(typename vector_type::size_type size) { rdbuf()->reserve(size); return *this; } - -- void swap(basic_ovectorstream &that) { std::basic_ostream::swap(that); rdbuf()->swap(*that.rdbuf()); } -- - private: - basic_vectorbuf m_rdbuf; - }; -@@ -373,8 +360,6 @@ - void vec(vector_type &&content) { rdbuf()->vec(std::move(content)); } - basic_vectorstream &reserve(typename vector_type::size_type size) { rdbuf()->reserve(size); return *this; } - -- void swap(basic_vectorstream &that) { std::basic_iostream::swap(that); rdbuf()->swap(*that.rdbuf()); } -- - private: - basic_vectorbuf m_rdbuf; - }; -@@ -386,16 +371,6 @@ - typedef basic_vectorstream vectorstream; - typedef basic_vectorstream wvectorstream; - --template --void swap(basic_vectorbuf &a, basic_vectorbuf &b) { a.swap(b); } -- --template --void swap(basic_ivectorstream &a, basic_ivectorstream &b) { a.swap(b); } --template --void swap(basic_ovectorstream &a, basic_ovectorstream &b) { a.swap(b); } --template --void swap(basic_vectorstream &a, basic_vectorstream &b) { a.swap(b); } -- - extern template class basic_ivectorstream; - extern template class basic_ivectorstream; - extern template class basic_ovectorstream; diff --git a/srcpkgs/mame/patches/fix-std_min_constexpr.patch b/srcpkgs/mame/patches/fix-std_min_constexpr.patch deleted file mode 100644 index d818fa0bbf6..00000000000 --- a/srcpkgs/mame/patches/fix-std_min_constexpr.patch +++ /dev/null @@ -1,14 +0,0 @@ -With gcc-4.9.4 libstdc++ std::min() is not a constexpr as required -by c++14 conforming compilers. Replace std::min with a conditional. - ---- src/devices/video/poly.h 2016-08-31 03:47:01.000000000 +0200 -+++ src/devices/video/poly.h 2016-08-31 07:56:47.483694756 +0200 -@@ -224,7 +224,7 @@ - // internal array types - typedef poly_array polygon_array; - typedef poly_array<_ObjectData, _MaxPolys + 1> objectdata_array; -- typedef poly_array unit_array; -+ typedef poly_array unit_array; - - // round in a cross-platform consistent manner - inline INT32 round_coordinate(_BaseType value) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 5b110742714..70d1fd353b3 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0179 +version=0180 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2" -checksum=d1616ef32b884c3e7913378ebf5282b6f846f895f419eb92a9068770581e081b +checksum=ba3f815418b93c5fc0d6e2f73fbc47e4898e27bee7176e7cdad3e32e774116c1 hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel