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=12a75a0ee4385...
https://src.fedoraproject.org/cgit/rpms/mame.git/commit/?id=8200debaabace....
Change:
+ExcludeArch: %{power64}
+%ifarch %{arm} %{ix86} riscv64 s390x
Thanks.
Full change:
============
commit 12a75a0ee438594796a54407360ab488b7d6aa94
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 28 13:12:58 2018 +0200
Updated to 0.200
Re-enabled %{arm} build
Fix imgtool options parsing
diff --git a/.gitignore b/.gitignore
index 9ffb638..7d45f67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@
/whatsnew_0198.txt
/mame0199s.exe
/whatsnew_0199.txt
+/mame0200s.exe
+/whatsnew_0200.txt
diff --git a/0001-imgtool-fix-parsing-options-with-enum-values.patch
b/0001-imgtool-fix-parsing-options-with-enum-values.patch
new file mode 100644
index 0000000..b1e6c83
--- /dev/null
+++ b/0001-imgtool-fix-parsing-options-with-enum-values.patch
@@ -0,0 +1,45 @@
+From 0d8ca95a1b5942b0c56744edfed3f74515418750 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Wed, 27 Jun 2018 08:15:39 +0200
+Subject: [PATCH] imgtool: fix parsing options with enum values
+
+When parsing an enumerated option, we should use the parameter of the
+enumerated value, as an integer, instead of the raw identifier as a
+string. The behaviour probably changed around commit b60879e595, but
+modules still expect the old behaviour.
+---
+ src/tools/imgtool/main.cpp | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp
+index 50c65845dd..5c55535932 100644
+--- a/src/tools/imgtool/main.cpp
++++ b/src/tools/imgtool/main.cpp
+@@ -106,7 +106,23 @@ static int parse_options(int argc, char *argv[], int minunnamed, int
maxunnamed,
+ if (i < minunnamed)
+ goto error; /* Too few unnamed */
+
+- resolution->find(name)->set_value(value);
++ util::option_resolution::entry *entry = resolution->find(name);
++ if (entry->option_type() == util::option_guide::entry::option_type::ENUM_BEGIN)
++ {
++ const util::option_guide::entry *enum_value;
++ for (enum_value = entry->enum_value_begin(); enum_value !=
entry->enum_value_end(); enum_value++)
++ {
++ if (!strcmp (enum_value->identifier(), value))
++ {
++ entry->set_value(enum_value->parameter());
++ break;
++ }
++ }
++ if (enum_value == entry->enum_value_end())
++ goto error;
++ }
++ else
++ entry->set_value(value);
+ }
+ }
+ }
+--
+2.17.1
+
diff --git a/mame.spec b/mame.spec
index 5deeed7..a9a246c 100644
--- a/mame.spec
+++ b/mame.spec
@@ -1,11 +1,11 @@
#The debug build is disabled by default, please use # --with debug to override
%bcond_with debug
-%global baseversion 199
+%global baseversion 200
Name: mame
Version: 0.%{baseversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Multiple Arcade Machine Emulator
#LGPLv2+:
@@ -22,13 +22,11 @@ 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-imgtool-fix-parsing-options-with-enum-values.patch
# %%{power64}:
#
https://github.com/mamedev/mame/issues/3157
#
https://bugzilla.redhat.com/show_bug.cgi?id=1541613
-# %%{arm}:
-#
https://github.com/mamedev/mame/issues/3639
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1584711
-ExcludeArch: %{power64} %{arm}
+ExcludeArch: %{power64}
#asio in Fedora repositories is too old (1.11.x is needed)
#BuildRequires: asio-devel
@@ -155,6 +153,7 @@ 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 -b .imgtool-options
# Create ini files
cat > %{name}.ini << EOF
@@ -355,6 +354,11 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} \;
%changelog
+* Wed Jul 25 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.200-1
+- Updated to 0.200
+- Re-enabled %%{arm} build
+- Fix imgtool options parsing
+
* Wed Jul 11 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.199-2
- Added riscv64 to the list of architectures needing -g1
- Rebuilt to fix issues caused by gcc PR86094
diff --git a/sources b/sources
index e6e6110..7853972 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mame0199s.exe) =
e6206a233675940ee41c73832e9d98dd99950e401d110c0a632d3d75a302afa1f94e02ae1f3dbff05037749d826ba4b73ca66783f059aec300504b590f4f6d7c
-SHA512 (whatsnew_0199.txt) =
962ed76b13c47d484c927af51b8764bae76809ac879d76721d6b436092fa999ac4b06699e9e8db5dbb3d66075f2f57daeac142075d70f82ffe0c596a1e518760
+SHA512 (mame0200s.exe) =
ca5c8025180b77fd15f8c81d1a2a34aa61a19bec7a4de408c646d75451831b401cec4d2423c8bab69f45709a045ff0f6de6613bebf375d8ac20438f8fdab69bc
+SHA512 (whatsnew_0200.txt) =
0e5134e5245969cf7d53ac9ad8577988f9cc09d322e8229c0b824db29d37fd1d69e949b7fd0848c39aceb65e4cc9e39d97e7b0aa176693b5bebfe7995d2453f1
commit 8200debaabaceda8ba395bc048851969a67f2e7b
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Wed Jul 11 07:47:41 2018 +0200
Added riscv64 to the list of architectures needing -g1
Rebuilt to fix issues caused by gcc PR86094
diff --git a/mame.spec b/mame.spec
index c23c735..5deeed7 100644
--- a/mame.spec
+++ b/mame.spec
@@ -5,7 +5,7 @@
Name: mame
Version: 0.%{baseversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multiple Arcade Machine Emulator
#LGPLv2+:
@@ -219,7 +219,7 @@ 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
+%ifarch %{arm} %{ix86} riscv64 s390x
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-g@-g1@")
#%%arm needs even more measures
%ifarch %{arm}
@@ -355,6 +355,10 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} \;
%changelog
+* Wed Jul 11 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.199-2
+- Added riscv64 to the list of architectures needing -g1
+- Rebuilt to fix issues caused by gcc PR86094
+
* Wed Jun 27 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.199-1
- Updated to 0.199
- Dropped upstreamed riscv64 patches