The package rpms/mame.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mame.git/commit/?id=3968ca81f96a6....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 3968ca81f96a6e7dd2ea1485dc8530a0adfdd345
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Wed Jun 27 20:15:31 2018 +0200
Updated to 0.199
Dropped upstreamed riscv64 patches
Ensured $RPM_OPT_FLAGS are used when building m68kmake
Ensured memory-saving compiler/linker flags are only used when needed
diff --git a/.gitignore b/.gitignore
index baaa367..9ffb638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@
/whatsnew_0197.txt
/mame0198s.exe
/whatsnew_0198.txt
+/mame0199s.exe
+/whatsnew_0199.txt
diff --git a/0001-First-attempt-at-enabling-building-on-riscv64.patch
b/0001-First-attempt-at-enabling-building-on-riscv64.patch
deleted file mode 100644
index efe3eee..0000000
--- a/0001-First-attempt-at-enabling-building-on-riscv64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0b04a32a946c316ef9e07bff746a5bfe0ba972d4 Mon Sep 17 00:00:00 2001
-From: Julian Sikorski <belegdol+github(a)gmail.com>
-Date: Mon, 11 Jun 2018 20:12:18 +0200
-Subject: [PATCH] First attempt at enabling building on riscv64
-
----
- makefile | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/makefile b/makefile
-index 119ef47816..37f5268a1d 100644
---- a/makefile
-+++ b/makefile
-@@ -349,6 +349,13 @@ ifndef NOASM
- endif
- endif
-
-+ifeq ($(findstring riscv64,$(UNAME)),riscv64)
-+ARCHITECTURE :=
-+ifndef NOASM
-+ NOASM := 1
-+endif
-+endif
-+
- # Emscripten
- ifeq ($(findstring emcc,$(CC)),emcc)
- TARGETOS := asmjs
---
-2.17.1
-
diff --git a/0002-PTR64-1-needs-to-be-defined-on-riscv64-otherwise-bui.patch
b/0002-PTR64-1-needs-to-be-defined-on-riscv64-otherwise-bui.patch
deleted file mode 100644
index 18d0969..0000000
--- a/0002-PTR64-1-needs-to-be-defined-on-riscv64-otherwise-bui.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 46de3a0dfb5c5145986de837887b4b7a443477ae Mon Sep 17 00:00:00 2001
-From: Julian Sikorski <belegdol+github(a)gmail.com>
-Date: Tue, 12 Jun 2018 17:54:30 +0200
-Subject: [PATCH 2/2] PTR64=1 needs to be defined on riscv64 otherwise build
- fails
-
----
- makefile | 6 ++++++
- scripts/genie.lua | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/makefile b/makefile
-index 37f5268a1d..5fb09182e9 100644
---- a/makefile
-+++ b/makefile
-@@ -166,6 +166,12 @@ endif
- ifneq ($(filter powerpc,$(UNAME_P)),)
- PLATFORM := powerpc
- endif
-+ifneq ($(filter riscv64%,$(UNAME_M)),)
-+PLATFORM := riscv64
-+endif
-+ifneq ($(filter riscv64%,$(UNAME_P)),)
-+PLATFORM := riscv64
-+endif
- ifneq ($(filter mips64%,$(UNAME_M)),)
- ifeq ($(shell getconf LONG_BIT),64)
- PLATFORM := mips64
-diff --git a/scripts/genie.lua b/scripts/genie.lua
-index 7cf0396b58..ed289f7339 100644
---- a/scripts/genie.lua
-+++ b/scripts/genie.lua
-@@ -1061,6 +1061,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then
- }
- end
-
-+if (_OPTIONS["PLATFORM"]=="riscv64") then
-+ defines {
-+ "PTR64=1",
-+ }
-+end
-+
- if (_OPTIONS["PLATFORM"]=="mips64") then
- defines {
- "PTR64=1",
---
-2.17.1
-
diff --git a/mame.spec b/mame.spec
index 2524075..c23c735 100644
--- a/mame.spec
+++ b/mame.spec
@@ -1,7 +1,7 @@
#The debug build is disabled by default, please use # --with debug to override
%bcond_with debug
-%global baseversion 198
+%global baseversion 199
Name: mame
Version: 0.%{baseversion}
@@ -22,14 +22,13 @@ Source0:
https://github.com/mamedev/%{name}/releases/download/%{name}0%{b
Source1:
http://mamedev.org/releases/whatsnew_0%{baseversion}.txt
Patch0: %{name}-fortify.patch
Patch1: %{name}-genie-systemlua.patch
-Patch2: 0001-First-attempt-at-enabling-building-on-riscv64.patch
-Patch3: 0002-PTR64-1-needs-to-be-defined-on-riscv64-otherwise-bui.patch
-# ppc64:
+# %%{power64}:
#
https://github.com/mamedev/mame/issues/3157
#
https://bugzilla.redhat.com/show_bug.cgi?id=1541613
-# armv7hl:
+# %%{arm}:
+#
https://github.com/mamedev/mame/issues/3639
#
https://bugzilla.redhat.com/show_bug.cgi?id=1584711
-ExcludeArch: ppc64 ppc64le armv7hl
+ExcludeArch: %{power64} %{arm}
#asio in Fedora repositories is too old (1.11.x is needed)
#BuildRequires: asio-devel
@@ -156,8 +155,6 @@ find \( -regex
'.*\.\(c\|cpp\|fsh\|fx\|h\|hpp\|lua\|make\|map\|md\|txt\|vsh\|xml
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systemlua
-%patch2 -p1
-%patch3 -p1
# Create ini files
cat > %{name}.ini << EOF
@@ -200,6 +197,10 @@ mv artwork/LICENSE LICENSE.CC0
mv bgfx/LICENSE LICENSE.BSD3
mv plugins/json/LICENSE LICENSE.MIT
+#fix m68kmake build flags
+sed -i "s@-std=c++11@-std=c++11 $RPM_OPT_FLAGS@"
src/devices/cpu/m68000/makefile
+sed -i "s@-lstdc++@-lstdc++ $RPM_LD_FLAGS@" src/devices/cpu/m68000/makefile
+
%build
#save some space
MAME_FLAGS="NOWERROR=1 OPTIMIZE=2 PYTHON_EXECUTABLE=python3 VERBOSE=1 \
@@ -218,7 +219,13 @@ MAME_FLAGS="NOWERROR=1 OPTIMIZE=2 PYTHON_EXECUTABLE=python3
VERBOSE=1 \
SDL_INI_PATH=%{_sysconfdir}/%{name};"
#standard -g causes builder to run out of memory
+%ifarch %{arm} %{ix86} s390x
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-g@-g1@")
+#%%arm needs even more measures
+%ifarch %{arm}
+RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory
-Wl,--reduce-memory-overheads"
+%endif
+%endif
%if %{with debug}
%make_build $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS" \
@@ -348,6 +355,12 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} \;
%changelog
+* Wed Jun 27 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.199-1
+- Updated to 0.199
+- Dropped upstreamed riscv64 patches
+- Ensured $RPM_OPT_FLAGS are used when building m68kmake
+- Ensured memory-saving compiler/linker flags are only used when needed
+
* Wed May 30 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.198-1
- Updated to 0.198
- Ensured python3 is called explicitly as per
https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
diff --git a/sources b/sources
index 57d19e0..e6e6110 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mame0198s.exe) =
6753df0841a27c8c0505e6b63cd9d7c9c446eb14359bb3bb34fbfd8e8737885c2f6e93821cddf46bbac5de2368be74d650d95a61831b18d77dd63f155f61875c
-SHA512 (whatsnew_0198.txt) =
9f0e6bd14fc4aa97aeed917406babcfb120ab3db042ab75f62d7fc05387431a6a256115c4b65f63d5ad46892098070f6591c20a303902f2fe8d2e24e8369053a
+SHA512 (mame0199s.exe) =
e6206a233675940ee41c73832e9d98dd99950e401d110c0a632d3d75a302afa1f94e02ae1f3dbff05037749d826ba4b73ca66783f059aec300504b590f4f6d7c
+SHA512 (whatsnew_0199.txt) =
962ed76b13c47d484c927af51b8764bae76809ac879d76721d6b436092fa999ac4b06699e9e8db5dbb3d66075f2f57daeac142075d70f82ffe0c596a1e518760