testing/mame: upgrade to 0.221

2 files changed, 9 insertions, 130 deletions

diff --git a/testing/mame/APKBUILD b/testing/mame/APKBUILD
index 5f7d117f34e..8e7075adb60 100644
--- a/testing/mame/APKBUILD
+++ b/testing/mame/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Taner Tas <taner76@gmail.com>
 # Maintainer: Taner Tas <taner76@gmail.com>
 pkgname=mame
-pkgver=0.214
+pkgver=0.221
 _pkgver=${pkgver/.}
 pkgrel=0
 pkgdesc="Multi Arcade Machine Emulator with GroovyMAME/Switchres/No-nag patchset."
@@ -48,26 +48,22 @@ subpackages="
 _groovymame_patch=groovymame-$pkgver.diff
 source="
 	https://github.com/mamedev/mame/archive/$pkgname$_pkgver.tar.gz
-	$_groovymame_patch::https://drive.google.com/uc?export=download&id=11cjRkLc4hfLdCVsNCXOua2YQeM_ZD2p-
+	$_groovymame_patch::https://drive.google.com/uc?export=download&id=1MLdYfcSszGhuodxV5mDxQyhqJcanDmeS
 	mame.ini
 	midi.conf
 	fix-musl.patch
 	nonag.patch
-	fix-ppc64le-float.patch
 	"
 options="!check" # No test suite
 builddir="$srcdir"/$pkgname-$pkgname${pkgver/.}
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	cp "$srcdir"/$_groovymame_patch . && dos2unix $_groovymame_patch
-	patch -p0 < $_groovymame_patch
+	patch -p1 < $_groovymame_patch
 }
 
 build() {
-	cd "$builddir"
-
 	case "$CARCH" in
 		x86|armhf|armv7) _PTR64=0;;
 		*) _PTR64=1;;
@@ -97,8 +93,8 @@ build() {
 		;;
 	esac
 
-	export CFLAGS="-I/usr/include/lua5.3 -DBX_CRT_MUSL -Wno-everything"
-	export CXXFLAGS="$CFLAGS"
+	export CFLAGS="$CFLAGS -I/usr/include/lua5.3 -DBX_CRT_MUSL -Wno-everything"
+	export CXXFLAGS="$CXXFLAGS $CFLAGS"
 	export LDFLAGS="$LDFLAGS -L/usr/lib/lua5.3"
 
 _build="make
@@ -135,7 +131,6 @@ _build="make
 }
 
 package() {
-	cd "$builddir"
 	install -D -m755 mame "$pkgdir"/usr/bin/mame || \
 	install -D -m755 mame64 "$pkgdir"/usr/bin/mame
 	install -D -m644  docs/man/mame.6  "$pkgdir"/usr/share/man/man6/mame.6
@@ -156,7 +151,7 @@ common() {
 	cd "$builddir"
 	pkgdesc="MAME - Common configuration files"
 	install -D -m644 "$srcdir"/mame.ini "$subpkgdir"/etc/mame/mame.ini
-	install -D -m644 "$srcdir"/midi.conf "$subpkgdir"/etc/modules-load.d/midi.conf
+	install -D -m644 "$srcdir"/midi.conf "$subpkgdir"/usr/lib/modules-load.d/midi.conf
 	install -d -m755 "$subpkgdir"/usr/share/$pkgname/roms
 }
 
@@ -224,10 +219,9 @@ lang() {
 	mkdir -p "$subpkgdir"/usr/share/$pkgname
 	cp -r language "$subpkgdir"/usr/share/$pkgname/
 }
-sha512sums="1c5851c7a95f4f3a312b47ba182f2f8fdfd186e16593d58555c8291174c07d8f18b7c4bec8d26589755e427dc2f29c66404a2dfb4f35dca9b63292b42faaca1c  mame0214.tar.gz
-a1bfe6af9ffd0f8ce0c8ee0613d74fb7f1da45b4be62e22c20c4d9a6a6bfeefb9ba41fa90157626cd8ded8aef0380963fd40dd83e6c93aa6444d7107af5be44e  groovymame-0.214.diff
+sha512sums="8a06684cad3e6e719c548fd09d4c7bbd0a11126270632c38db5b9c521cf1cb0e9ad30a194c50be3a01f4dc86a3e92e075f9a4ee52a6a86aa1db50f5a56640257  mame0221.tar.gz
+8961e417568d9e047edd92b204713466be7d06d790125a14688a2d14312ec9c52b6b46e33ab2e9a0e88443ef900d901002fafe640e31d1c255360074e04a6490  groovymame-0.221.diff
 dc008245cbea0b94f58d83e09bf5fd3fff04ac0e2f3a36b910a8b7633c5377419fc67a1fd366ef268e283f744d9a8d29928cfacf456b3edaa2d0b1a11d46a701  mame.ini
 8f83ff5a916f4ff8e86c5afbdfe4475f7780bb36c20c78d6d029d0eb0dafd77b3471faa538aca384001d2049dc94c4df3429c67d743adde9fd6329c91e6d19a2  midi.conf
 75bba366aebb37de7758368fbf7418194a18d535e61c1768e6c2c5cf4b3b7a2f625ef687cb8278c03daa9e308951df4c0bdcc944dfcc4ce5305f5ac83e5e049b  fix-musl.patch
-864816a55f35f9d485ccd143a1e0acd76d47239a6d5344be2a76b50fd4efbdfb4f3e45318d7dfda67faa63c0a52022f2e8313f058965a1eba60e6ca4677a519b  nonag.patch
-daa915d08b61e3828b28144f1934fd1fa9fe04da00b3536f86b984035f1a1bc81da498e1bc8632bc5f9c8b86533b70814a91318627fcafc3f05ebda59e303cc4  fix-ppc64le-float.patch"
+864816a55f35f9d485ccd143a1e0acd76d47239a6d5344be2a76b50fd4efbdfb4f3e45318d7dfda67faa63c0a52022f2e8313f058965a1eba60e6ca4677a519b  nonag.patch"
diff --git a/testing/mame/fix-ppc64le-float.patch b/testing/mame/fix-ppc64le-float.patch
deleted file mode 100644
index 99a31eda2c5..00000000000
--- a/testing/mame/fix-ppc64le-float.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/3rdparty/bx/include/bx/inline/endian.inl
-+++ b/3rdparty/bx/include/bx/inline/endian.inl
-@@ -46,7 +46,7 @@
- 	}
- 
- 	template <typename Ty>
--	inline Ty toLittleEndian(const Ty _in)
-+	inline Ty toLittleEndian(Ty _in)
- 	{
- #if BX_CPU_ENDIAN_BIG
- 		return endianSwap(_in);
-@@ -56,7 +56,7 @@
- 	}
- 
- 	template <typename Ty>
--	inline Ty toBigEndian(const Ty _in)
-+	inline Ty toBigEndian(Ty _in)
- 	{
- #if BX_CPU_ENDIAN_LITTLE
- 		return endianSwap(_in);
-@@ -66,7 +66,7 @@
- 	}
- 
- 	template <typename Ty>
--	inline Ty toHostEndian(const Ty _in, bool _fromLittleEndian)
-+	inline Ty toHostEndian(Ty _in, bool _fromLittleEndian)
- 	{
- #if BX_CPU_ENDIAN_LITTLE
- 		return _fromLittleEndian ? _in : endianSwap(_in);
---- a/3rdparty/bx/include/bx/inline/readerwriter.inl
-+++ b/3rdparty/bx/include/bx/inline/readerwriter.inl
-@@ -273,7 +273,7 @@
- 	}
- 
- 	template<typename Ty>
--	int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
-+	inline int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
-@@ -281,7 +281,7 @@
- 	}
- 
- 	template<typename Ty>
--	int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
-+	inline int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
-@@ -329,7 +329,7 @@
- 	}
- 
- 	template<typename Ty>
--	int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
-+	inline int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
-@@ -337,7 +337,7 @@
- 	}
- 
- 	template<typename Ty>
--	int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
-+	inline int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
-@@ -346,8 +346,14 @@
- 		return result;
- 	}
- 
-+	template<>
-+	inline int32_t writeLE(WriterI* _writer, const float& _value, Error* _err)
-+	{
-+		return writeLE(_writer, floatToBits(_value), _err);
-+	}
-+
- 	template<typename Ty>
--	int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
-+	inline int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
-@@ -356,6 +362,12 @@
- 		return result;
- 	}
- 
-+	template<>
-+	inline int32_t writeBE(WriterI* _writer, const float& _value, Error* _err)
-+	{
-+		return writeBE(_writer, floatToBits(_value), _err);
-+	}
-+
- 	inline int64_t skip(SeekerI* _seeker, int64_t _offset)
- 	{
- 		return _seeker->seek(_offset, Whence::Current);
-@@ -392,7 +404,7 @@
- 	}
- 
- 	template<typename Ty>
--	int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
-+	inline int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
- 	{
- 		BX_ERROR_SCOPE(_err);
- 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
---- a/3rdparty/bx/include/bx/readerwriter.h
-+++ b/3rdparty/bx/include/bx/readerwriter.h
-@@ -10,6 +10,7 @@
- #include "endian.h"
- #include "error.h"
- #include "filepath.h"
-+#include "math.h"
- #include "string.h"
- #include "uint32_t.h"
-