From 8b3336e2de1bb07cecbae891816f1b8ea463b359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 31 Dec 2020 16:42:59 +0100
Subject: [PATCH] mame: proper fix for powerpc64

Remove the patches and add -mlong-double-64 to the C{,XX}FLAGS for ppc*.
---
 srcpkgs/mame/patches/ppc-fixes.patch       | 15 ---------------
 srcpkgs/mame/patches/ppc-long_double.patch | 16 ----------------
 srcpkgs/mame/template                      |  7 +++++++
 3 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/mame/patches/ppc-fixes.patch
 delete mode 100644 srcpkgs/mame/patches/ppc-long_double.patch

diff --git a/srcpkgs/mame/patches/ppc-fixes.patch b/srcpkgs/mame/patches/ppc-fixes.patch
deleted file mode 100644
index c65ee1c8852..00000000000
--- a/srcpkgs/mame/patches/ppc-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- makefile
-+++ makefile
-@@ -394,6 +394,12 @@ BIGENDIAN := 1
- endif
- endif # BIGENDIAN
- 
-+# Work around an issue with long doubles on ppc (#3157)
-+ifneq (,$(findstring ppc,$(UNAME)))
-+ARCHOPTS_C += -mlong-double-64
-+ARCHOPTS_CXX += -mlong-double-64
-+endif
-+
- ifndef PYTHON_EXECUTABLE
- PYTHON := python
- else
diff --git a/srcpkgs/mame/patches/ppc-long_double.patch b/srcpkgs/mame/patches/ppc-long_double.patch
deleted file mode 100644
index a01fa1000f2..00000000000
--- a/srcpkgs/mame/patches/ppc-long_double.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/emu/xtal.h	2020-12-30 16:46:10.000000000 +0100
-+++ src/emu/xtal.h	2020-12-31 13:41:51.679447004 +0100
-@@ -81,8 +81,13 @@
- constexpr XTAL operator *(double       mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
- 
- constexpr XTAL operator ""_Hz_XTAL(long double clock) { return XTAL(double(clock)); }
-+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
-+constexpr XTAL operator ""_kHz_XTAL(long double clock) { return XTAL(double(clock) * 1e3); }
-+constexpr XTAL operator ""_MHz_XTAL(long double clock) { return XTAL(double(clock) * 1e6); }
-+#else
- constexpr XTAL operator ""_kHz_XTAL(long double clock) { return XTAL(double(clock * 1e3)); }
- constexpr XTAL operator ""_MHz_XTAL(long double clock) { return XTAL(double(clock * 1e6)); }
-+#endif
- 
- constexpr XTAL operator ""_Hz_XTAL(unsigned long long clock) { return XTAL(double(clock)); }
- constexpr XTAL operator ""_kHz_XTAL(unsigned long long clock) { return XTAL(double(clock) * 1e3); }
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 455f48043ef..4e52dae71b9 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -21,6 +21,13 @@ CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include
 CXXFLAGS="$CFLAGS"
 [ "$XBPS_TARGET_LIBC" = musl ] && CXXFLAGS+=" -DBX_CRT_MUSL=1"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)
+		CFLAGS+=" -mlong-double-64"
+		CXXFLAGS+=" -mlong-double-64"
+		;;
+esac
+
 build_options="qt"
 build_options_default="qt"