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=ec8386fd4cf39....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit ec8386fd4cf39b187361de6586cfab0a92aa79b8
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Jun 28 07:12:41 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/mame.spec b/mame.spec
index 6efc958..6d2943f 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,12 +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
-# 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
@@ -196,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 \
@@ -214,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" \
@@ -344,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