The package rpms/bletchmame.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/bletchmame.git/commit/?id=faa4d42...
https://src.fedoraproject.org/cgit/rpms/bletchmame.git/commit/?id=23474e9...
https://src.fedoraproject.org/cgit/rpms/bletchmame.git/commit/?id=9992530....
Change:
-%ifnarch armv7hl i686
+%ifnarch armv7hl i686
+ExcludeArch: s390x
Thanks.
Full change:
============
commit a622b24127dc5eca3a7002453ba48e11e678ef83
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sat Feb 26 08:46:23 2022 -0800
Update to 2.13
diff --git a/.gitignore b/.gitignore
index e4d57f5..2ab8e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/bletchmame-2.10.tar.gz
/bletchmame-2.11.tar.gz
/bletchmame-2.12.tar.gz
+/bletchmame-2.13.tar.gz
diff --git a/322.patch b/322.patch
new file mode 100644
index 0000000..d3b86ff
--- /dev/null
+++ b/322.patch
@@ -0,0 +1,63 @@
+From ee99c84784eb29f9bcc4f049009b3e8ed1583578 Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <davide(a)cavalca.name>
+Date: Sat, 26 Feb 2022 08:41:58 -0800
+Subject: [PATCH] Fix include path when doing an out-of-tree build
+
+---
+ CMakeLists.txt | 4 ++--
+ scripts/bletchmame_build_msvc2019.sh | 4 ++--
+ scripts/bletchmame_build_msys2.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c8e9915..0d02f1b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -254,7 +254,7 @@ add_library(BletchMAME_core
+ src/dialogs/switches.h
+ ${TS_FILES}
+ )
+-target_include_directories(BletchMAME_core PRIVATE src lib
${CMAKE_CURRENT_BINARY_DIR}/include)
++target_include_directories(BletchMAME_core PRIVATE src lib ${CMAKE_SOURCE_DIR}/include)
+ target_link_libraries(BletchMAME_core PRIVATE Qt6::Widgets ${QUAZIP_LIBRARIES}
Qt6::Core5Compat ${ZLIB_LIBRARIES})
+
+
+@@ -263,7 +263,7 @@ target_link_libraries(BletchMAME_core PRIVATE Qt6::Widgets
${QUAZIP_LIBRARIES} Q
+ #############################################################################
+
+ add_executable(BletchMAME WIN32 src/main.cpp src/resources.qrc src/winresources.rc)
+-target_include_directories(BletchMAME PRIVATE src lib
${CMAKE_CURRENT_BINARY_DIR}/include)
++target_include_directories(BletchMAME PRIVATE src lib ${CMAKE_SOURCE_DIR}/include)
+ target_link_libraries(BletchMAME PRIVATE BletchMAME_core Qt6::Widgets
${QUAZIP_LIBRARIES} Qt6::Core5Compat ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
+ install(TARGETS BletchMAME RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+diff --git a/scripts/bletchmame_build_msvc2019.sh b/scripts/bletchmame_build_msvc2019.sh
+index ecbcc4f..5b3db03 100644
+--- a/scripts/bletchmame_build_msvc2019.sh
++++ b/scripts/bletchmame_build_msvc2019.sh
+@@ -78,8 +78,8 @@ cmake -S. -B${BLETCHMAME_BUILD_DIR} \
+ -DCMAKE_INCLUDE_PATH=$DEPS_INSTALL_DIR/include
+
+ # generate version.gen.h
+-mkdir -p ${BLETCHMAME_BUILD_DIR}/include
+-git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_BUILD_DIR}/include/version.gen.h
++mkdir -p ${BLETCHMAME_DIR}/include
++git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_DIR}/include/version.gen.h
+
+ # and build!
+ cmake --build ${BLETCHMAME_BUILD_DIR} --parallel --config ${CONFIG}
+diff --git a/scripts/bletchmame_build_msys2.sh b/scripts/bletchmame_build_msys2.sh
+index 281a8fe..060c241 100644
+--- a/scripts/bletchmame_build_msys2.sh
++++ b/scripts/bletchmame_build_msys2.sh
+@@ -51,8 +51,8 @@ cmake -S. -B${BLETCHMAME_BUILD_DIR} \
+ -DQuaZip-Qt6_DIR=${DEPS_INSTALL_DIR}/lib/cmake/QuaZip-Qt6-1.1
+
+ # generate version.gen.h
+-mkdir -p ${BLETCHMAME_BUILD_DIR}/include
+-git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_BUILD_DIR}/include/version.gen.h
++mkdir -p ${BLETCHMAME_DIR}/include
++git describe --tags | perl scripts/process_version.pl --versionhdr >
${BLETCHMAME_DIR}/include/version.gen.h
+
+ # and build!
+ cmake --build ${BLETCHMAME_BUILD_DIR} --parallel
diff --git a/README.fedora b/README.fedora
index bfc8d66..fcd7341 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,3 +1,8 @@
BletchMAME will not work properly if MAME is setup to use the opengl video
driver, which is the default on Fedora. Comment out the "video opengl" entry
-in /etc/mame/mame.ini if you encounter issues.
+in /etc/mame/mame.ini if you encounter issues. This issue is tracked upstream
+in
https://github.com/npwoods/bletchmame/issues/130.
+
+If you have trouble getting machines to receive input correctly, try switching
+to full screen and back (e.g. by pressing F11). This issue is tracked upstream
+in
https://github.com/npwoods/bletchmame/issues/295.
diff --git a/bletchmame-default-paths.patch b/bletchmame-default-paths.patch
index 38d037e..c832e12 100644
--- a/bletchmame-default-paths.patch
+++ b/bletchmame-default-paths.patch
@@ -1,13 +1,13 @@
diff -Naur a/src/prefs.cpp b/src/prefs.cpp
---- a/src/prefs.cpp 2022-02-17 06:55:26.000000000 -0800
-+++ b/src/prefs.cpp 2022-02-17 08:58:37.889521217 -0800
-@@ -1333,8 +1333,10 @@
+--- a/src/prefs.cpp 2022-02-26 05:33:37.000000000 -0800
++++ b/src/prefs.cpp 2022-02-26 08:22:14.739017140 -0800
+@@ -1332,8 +1332,10 @@
Preferences::GlobalPathsInfo::GlobalPathsInfo(const std::optional<QDir>
&configDirectory)
{
// set up default paths - some of these require a config directory
-- m_paths[(size_t)global_path_type::PLUGINS] =
"$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/";
+- m_paths[(size_t)global_path_type::PLUGINS] = joinPathList(QStringList() <<
"$(BLETCHMAMEPATH)/plugins/" << "$(MAMEPATH)/plugins/");
- m_paths[(size_t)global_path_type::HASH] = "$(MAMEPATH)/hash/";
-+ m_paths[(size_t)global_path_type::PLUGINS] =
"/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/";
++ m_paths[(size_t)global_path_type::PLUGINS] = joinPathList(QStringList() <<
"/usr/share/bletchmame/plugins/" <<
"/usr/share/mame/plugins/");
+ m_paths[(size_t)global_path_type::HASH] = "/usr/share/mame/hash/";
+ m_paths[(size_t)global_path_type::ARTWORK] = "/usr/share/mame/artwork/";
+ m_paths[(size_t)global_path_type::EMU_EXECUTABLE] = "/usr/bin/mame";
@@ -15,8 +15,8 @@ diff -Naur a/src/prefs.cpp b/src/prefs.cpp
{
m_paths[(size_t)global_path_type::CONFIG] = configDirectory->absolutePath();
diff -Naur a/src/tests/prefs_test.cpp b/src/tests/prefs_test.cpp
---- a/src/tests/prefs_test.cpp 2022-02-17 06:55:26.000000000 -0800
-+++ b/src/tests/prefs_test.cpp 2022-02-17 09:09:38.397155899 -0800
+--- a/src/tests/prefs_test.cpp 2022-02-26 05:33:37.000000000 -0800
++++ b/src/tests/prefs_test.cpp 2022-02-26 08:20:12.597699979 -0800
@@ -197,7 +197,7 @@
QVERIFY(prefs.getWindowState() == WindowState::Normal);
QVERIFY(prefs.getSelectedTab() == list_view_type::MACHINE);
diff --git a/bletchmame.spec b/bletchmame.spec
index fbd5a61..e70781c 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.12
+Version: 2.13
Release: %autorelease
Summary: MAME emulator frontend
@@ -14,6 +14,8 @@ Patch0: bletchmame-default-paths.patch
# Disable broken tests on 32 bit architectures
#
https://github.com/npwoods/bletchmame/issues/256
Patch1: bletchmame-disable-broken-tests.patch
+# Fix include path when doing an out-of-tree build
+Patch2: %{forgeurl}/pull/322.patch
# Temporarily disable due to missing dependencies
#
https://bugzilla.redhat.com/show_bug.cgi?id=2012824
@@ -26,7 +28,7 @@ BuildRequires: expat-devel
BuildRequires: libappstream-glib
BuildRequires: libxkbcommon-devel
BuildRequires: observable-devel
-BuildRequires: python3
+BuildRequires: perl
BuildRequires: qt6-qttools-devel
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qt5compat-devel
@@ -52,6 +54,7 @@ emulation.
%ifarch armv7hl i686
%patch1 -p1
%endif
+%patch2 -p1
cp -p %{SOURCE1} .
@@ -60,11 +63,9 @@ rm -r lib/*
ln -s %{_includedir}/observable lib/observable
# Set build version
-cat > src/buildversion.gen.cpp <<EOF
-const char buildVersion[] = "$(echo "v%{version}" | python3
version.py)";
-const char buildRevision[] = "%{commit}";
-const char buildDateTime[] = "$(date -Ins)";
-EOF
+mkdir include
+echo "v%{version}" | \
+ perl scripts/process_version.pl --versionhdr > include/version.gen.h
%build
# Disable libraries as they're only for internal use and not meant to be
@@ -72,7 +73,7 @@ EOF
%cmake \
-DUSE_SHARED_LIBS=ON \
-DBUILD_SHARED_LIBS=OFF \
- -DHAS_BUILDVERSION_GEN_CPP=1
+ -DHAS_VERSION_GEN_H=1
%cmake_build
%install
diff --git a/sources b/sources
index e4a101c..836f46d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.12.tar.gz) =
505a7c9d6ec4d014522b7c1cc8077c4559125d70771d0f1b32e5969b59907907e49dc90c8c81b43e2ec6a65b13bac10f7418ca2ae1421062e34d029323505c65
+SHA512 (bletchmame-2.13.tar.gz) =
600d1efa1624e6d7e3c4738173805a9db7968fce35a661de305446e2663a1aa3cf02e10881b88d2540473bc2972d7e80402a8b6643c8fae282fb57332ea23939
commit e0e2bedf627dc6ad0627c3438411368429d40911
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Thu Feb 17 09:25:24 2022 -0800
Update to 2.12; Fixes: RHBZ#2045222
diff --git a/.gitignore b/.gitignore
index 0602183..e4d57f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/bletchmame-2.9.tar.gz
/bletchmame-2.10.tar.gz
/bletchmame-2.11.tar.gz
+/bletchmame-2.12.tar.gz
diff --git a/bletchmame-default-paths.patch b/bletchmame-default-paths.patch
index e83f1a7..38d037e 100644
--- a/bletchmame-default-paths.patch
+++ b/bletchmame-default-paths.patch
@@ -1,23 +1,23 @@
diff -Naur a/src/prefs.cpp b/src/prefs.cpp
---- a/src/prefs.cpp 2021-12-05 14:18:53.000000000 -0800
-+++ b/src/prefs.cpp 2021-12-11 10:11:02.636188710 -0800
-@@ -1323,8 +1323,10 @@
+--- a/src/prefs.cpp 2022-02-17 06:55:26.000000000 -0800
++++ b/src/prefs.cpp 2022-02-17 08:58:37.889521217 -0800
+@@ -1333,8 +1333,10 @@
Preferences::GlobalPathsInfo::GlobalPathsInfo(const std::optional<QDir>
&configDirectory)
{
// set up default paths - some of these require a config directory
-- m_paths[(size_t)global_path_type::PLUGINS] =
QDir::toNativeSeparators("$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/");
-- m_paths[(size_t)global_path_type::HASH] =
QDir::toNativeSeparators("$(MAMEPATH)/hash/");
-+ m_paths[(size_t)global_path_type::PLUGINS] =
QDir::toNativeSeparators("/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/");
-+ m_paths[(size_t)global_path_type::HASH] =
QDir::toNativeSeparators("/usr/share/mame/hash/");
-+ m_paths[(size_t)global_path_type::ARTWORK] =
QDir::toNativeSeparators("/usr/share/mame/artwork/");
-+ m_paths[(size_t)global_path_type::EMU_EXECUTABLE] =
QDir::toNativeSeparators("/usr/bin/mame");
+- m_paths[(size_t)global_path_type::PLUGINS] =
"$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/";
+- m_paths[(size_t)global_path_type::HASH] = "$(MAMEPATH)/hash/";
++ m_paths[(size_t)global_path_type::PLUGINS] =
"/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/";
++ m_paths[(size_t)global_path_type::HASH] = "/usr/share/mame/hash/";
++ m_paths[(size_t)global_path_type::ARTWORK] = "/usr/share/mame/artwork/";
++ m_paths[(size_t)global_path_type::EMU_EXECUTABLE] = "/usr/bin/mame";
if (configDirectory)
{
- m_paths[(size_t)global_path_type::CONFIG] =
QDir::toNativeSeparators(configDirectory->absolutePath());
+ m_paths[(size_t)global_path_type::CONFIG] = configDirectory->absolutePath();
diff -Naur a/src/tests/prefs_test.cpp b/src/tests/prefs_test.cpp
---- a/src/tests/prefs_test.cpp 2021-12-05 14:18:53.000000000 -0800
-+++ b/src/tests/prefs_test.cpp 2021-12-11 10:11:47.628808234 -0800
-@@ -191,7 +191,7 @@
+--- a/src/tests/prefs_test.cpp 2022-02-17 06:55:26.000000000 -0800
++++ b/src/tests/prefs_test.cpp 2022-02-17 09:09:38.397155899 -0800
+@@ -197,7 +197,7 @@
QVERIFY(prefs.getWindowState() == WindowState::Normal);
QVERIFY(prefs.getSelectedTab() == list_view_type::MACHINE);
QVERIFY(prefs.getAuditingState() == AuditingState::Default);
@@ -25,4 +25,21 @@ diff -Naur a/src/tests/prefs_test.cpp b/src/tests/prefs_test.cpp
+ QVERIFY(prefs.getGlobalPath(global_path_type::EMU_EXECUTABLE) ==
"/usr/bin/mame");
QVERIFY(prefs.getGlobalPath(global_path_type::ROMS) == "");
QVERIFY(prefs.getGlobalPath(global_path_type::SAMPLES) == "");
- QVERIFY(prefs.getGlobalPath(global_path_type::CONFIG) ==
QDir::toNativeSeparators(tempDir.path()));
+ QVERIFY(prefs.getGlobalPath(global_path_type::CONFIG) == tempDir.path());
+@@ -223,13 +223,13 @@
+ // validate the "plugins" dir is set up
+ QStringList pluginsPath = prefs.getSplitPaths(global_path_type::PLUGINS);
+ QVERIFY(pluginsPath.size() == 2);
+- QVERIFY(pluginsPath[0] ==
QDir(QCoreApplication::applicationDirPath()).filePath("plugins/"));
+- QVERIFY(pluginsPath[1] ==
QDir(tempDir.path()).filePath("mame_dir/plugins/"));
++ QVERIFY(pluginsPath[0] == QDir("/usr/share/bletchmame/plugins/"));
++ QVERIFY(pluginsPath[1] == QDir("/usr/share/mame/plugins/"));
+
+ // validate the "hash" dir is set up
+ QStringList hashPath = prefs.getSplitPaths(global_path_type::HASH);
+ QVERIFY(hashPath.size() == 1);
+- QVERIFY(hashPath[0] == QDir(tempDir.path()).filePath("mame_dir/hash/"));
++ QVERIFY(hashPath[0] == QDir("/usr/share/mame/hash/"));
+ }
+
+
diff --git a/bletchmame-disable-broken-tests.patch
b/bletchmame-disable-broken-tests.patch
index 587018e..ade238e 100644
--- a/bletchmame-disable-broken-tests.patch
+++ b/bletchmame-disable-broken-tests.patch
@@ -1,7 +1,7 @@
diff -Naur a/src/tests/info_builder_test.cpp b/src/tests/info_builder_test.cpp
---- a/src/tests/info_builder_test.cpp 2021-12-27 18:57:34.000000000 +0100
-+++ b/src/tests/info_builder_test.cpp 2021-12-28 12:08:22.978460266 +0100
-@@ -19,12 +19,6 @@
+--- a/src/tests/info_builder_test.cpp 2022-02-17 06:55:26.000000000 -0800
++++ b/src/tests/info_builder_test.cpp 2022-02-17 09:22:35.907056821 -0800
+@@ -22,12 +22,6 @@
private slots:
void general();
@@ -14,7 +14,7 @@ diff -Naur a/src/tests/info_builder_test.cpp
b/src/tests/info_builder_test.cpp
};
}
-@@ -101,64 +95,6 @@
+@@ -104,64 +98,6 @@
}
diff --git a/bletchmame.spec b/bletchmame.spec
index 3c9d40f..fbd5a61 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.11
+Version: 2.12
Release: %autorelease
Summary: MAME emulator frontend
diff --git a/sources b/sources
index 24e9ca0..e4a101c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.11.tar.gz) =
7ce2ce6885cd93cf9c53ae5cb9dc17fbda95e175450ade4bc58afbc10486d4d0b1da5e510725dfcf11403d88b4f9c637f7dc251b2020ce6d72575f30580af0f1
+SHA512 (bletchmame-2.12.tar.gz) =
505a7c9d6ec4d014522b7c1cc8077c4559125d70771d0f1b32e5969b59907907e49dc90c8c81b43e2ec6a65b13bac10f7418ca2ae1421062e34d029323505c65
commit 2aee12e61af60ad674f37b0f7144d0f5bb74742d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 19 22:24:26 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit f65147ec16e2e21b9870e03be774e52a80f5d104
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Tue Dec 28 10:32:22 2021 +0100
Update to 2.11; Fixes: RHBZ#2035821
diff --git a/.gitignore b/.gitignore
index 6b2c543..0602183 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/bletchmame-2.8.tar.gz
/bletchmame-2.9.tar.gz
/bletchmame-2.10.tar.gz
+/bletchmame-2.11.tar.gz
diff --git a/bletchmame-disable-broken-tests.patch
b/bletchmame-disable-broken-tests.patch
index d92140b..587018e 100644
--- a/bletchmame-disable-broken-tests.patch
+++ b/bletchmame-disable-broken-tests.patch
@@ -1,17 +1,20 @@
-diff --git a/src/tests/info_builder_test.cpp b/src/tests/info_builder_test.cpp
-index 1093d83..ca69534 100644
---- a/src/tests/info_builder_test.cpp
-+++ b/src/tests/info_builder_test.cpp
-@@ -19,8 +19,6 @@ namespace
+diff -Naur a/src/tests/info_builder_test.cpp b/src/tests/info_builder_test.cpp
+--- a/src/tests/info_builder_test.cpp 2021-12-27 18:57:34.000000000 +0100
++++ b/src/tests/info_builder_test.cpp 2021-12-28 12:08:22.978460266 +0100
+@@ -19,12 +19,6 @@
private slots:
void general();
-- void compareBinaries_coco() {
compareBinaries(":/resources/listxml_coco.xml"); }
- void compareBinaries_alienar() {
compareBinaries(":/resources/listxml_alienar.xml"); }
+- void compareBinaries_coco() {
compareBinaries(":/resources/listxml_coco.xml"); }
+- void compareBinaries_fake() {
compareBinaries(":/resources/listxml_fake.xml"); }
+-
+- private:
+- void compareBinaries(const QString &fileName);
+ };
+ }
- private:
- void compareBinaries(const QString &fileName);
-@@ -100,64 +98,6 @@ void Test::general()
+@@ -101,64 +95,6 @@
}
diff --git a/bletchmame-quazip-version.patch b/bletchmame-quazip-version.patch
deleted file mode 100644
index fd643e2..0000000
--- a/bletchmame-quazip-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3c5992c675313764b6766390107d134b7d6458c7 Mon Sep 17 00:00:00 2001
-From: Davide Cavalca <davide(a)cavalca.name>
-Date: Sat, 11 Dec 2021 10:04:24 -0800
-Subject: [PATCH] Do not hardcode quazip version
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5df68ef..8b6370d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ find_package(Qt6 COMPONENTS Widgets LinguistTools Core5Compat Test
REQUIRED)
-
- # QuaZip
- find_package(QuaZip-Qt6 REQUIRED)
--include_directories(SYSTEM ${QuaZip-Qt6_DIR}/../../../include/QuaZip-Qt6-1.1/quazip)
-+include_directories(SYSTEM
${QuaZip-Qt6_DIR}/../../../include/QuaZip-Qt6-${QuaZip-Qt6_VERSION}/quazip)
- link_directories(${QuaZip-Qt6_DIR}/../../../lib)
- if(NOT DEFINED QUAZIP_LIBRARIES)
- set(QUAZIP_LIBRARIES quazip1-qt6)
diff --git a/bletchmame.spec b/bletchmame.spec
index 700439a..3c9d40f 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.10
+Version: 2.11
Release: %autorelease
Summary: MAME emulator frontend
@@ -11,11 +11,9 @@ Source0:
%{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: README.fedora
# Use the distribution MAME by default
Patch0: bletchmame-default-paths.patch
-# PR#255: Do not hardcode quazip version
-Patch1: %{forgeurl}/pull/255.patch#/bletchmame-quazip-version.patch
# Disable broken tests on 32 bit architectures
#
https://github.com/npwoods/bletchmame/issues/256
-Patch2: bletchmame-disable-broken-tests.patch
+Patch1: bletchmame-disable-broken-tests.patch
# Temporarily disable due to missing dependencies
#
https://bugzilla.redhat.com/show_bug.cgi?id=2012824
@@ -50,10 +48,9 @@ emulation.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Disable broken tests on 32 bit architectures
%ifarch armv7hl i686
-%patch2 -p1
+%patch1 -p1
%endif
cp -p %{SOURCE1} .
diff --git a/sources b/sources
index 9d59f8e..24e9ca0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.10.tar.gz) =
ba72ba45716e4882bff29b959a673c373f3230f71e6b34a1ea5e4cbe05445bcbbf774d7845050b9092fafdca3d4b390edcfc54a502967f9edcf4ca99adff4d7f
+SHA512 (bletchmame-2.11.tar.gz) =
7ce2ce6885cd93cf9c53ae5cb9dc17fbda95e175450ade4bc58afbc10486d4d0b1da5e510725dfcf11403d88b4f9c637f7dc251b2020ce6d72575f30580af0f1
commit faa4d42abcc0137e47587a765566c9c1d9a9a07e
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sat Dec 11 09:40:05 2021 -0800
Update to 2.10
diff --git a/.gitignore b/.gitignore
index 5b04fbf..6b2c543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/bletchmame-2.7.tar.gz
/bletchmame-2.8.tar.gz
/bletchmame-2.9.tar.gz
+/bletchmame-2.10.tar.gz
diff --git a/bletchmame-default-paths.patch b/bletchmame-default-paths.patch
index 42f6bf1..e83f1a7 100644
--- a/bletchmame-default-paths.patch
+++ b/bletchmame-default-paths.patch
@@ -1,22 +1,28 @@
diff -Naur a/src/prefs.cpp b/src/prefs.cpp
---- a/src/prefs.cpp 2021-10-23 06:45:33.000000000 -0700
-+++ b/src/prefs.cpp 2021-10-24 06:40:44.497811677 -0700
-@@ -184,6 +184,9 @@
- , m_auditingState(AuditingState::Default)
+--- a/src/prefs.cpp 2021-12-05 14:18:53.000000000 -0800
++++ b/src/prefs.cpp 2021-12-11 10:11:02.636188710 -0800
+@@ -1323,8 +1323,10 @@
+ Preferences::GlobalPathsInfo::GlobalPathsInfo(const std::optional<QDir>
&configDirectory)
{
- // default paths
-+ setGlobalPath(global_path_type::EMU_EXECUTABLE,
QDir::toNativeSeparators("/usr/bin/mame"));
-+ setGlobalPath(global_path_type::HASH,
QDir::toNativeSeparators("/usr/share/mame/hash/"));
-+ setGlobalPath(global_path_type::ARTWORK,
QDir::toNativeSeparators("/usr/share/mame/artwork/"));
- setGlobalPath(global_path_type::CONFIG, getConfigDirectory(true));
- setGlobalPath(global_path_type::NVRAM, getConfigDirectory(true));
- setGlobalPath(global_path_type::PLUGINS, getDefaultPluginsDirectory());
-@@ -1090,7 +1093,7 @@
-
- static QString getDefaultPluginsDirectory()
- {
-- return
QDir::toNativeSeparators("$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/");
-+ return
QDir::toNativeSeparators("/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/");
- }
-
-
+ // set up default paths - some of these require a config directory
+- m_paths[(size_t)global_path_type::PLUGINS] =
QDir::toNativeSeparators("$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/");
+- m_paths[(size_t)global_path_type::HASH] =
QDir::toNativeSeparators("$(MAMEPATH)/hash/");
++ m_paths[(size_t)global_path_type::PLUGINS] =
QDir::toNativeSeparators("/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/");
++ m_paths[(size_t)global_path_type::HASH] =
QDir::toNativeSeparators("/usr/share/mame/hash/");
++ m_paths[(size_t)global_path_type::ARTWORK] =
QDir::toNativeSeparators("/usr/share/mame/artwork/");
++ m_paths[(size_t)global_path_type::EMU_EXECUTABLE] =
QDir::toNativeSeparators("/usr/bin/mame");
+ if (configDirectory)
+ {
+ m_paths[(size_t)global_path_type::CONFIG] =
QDir::toNativeSeparators(configDirectory->absolutePath());
+diff -Naur a/src/tests/prefs_test.cpp b/src/tests/prefs_test.cpp
+--- a/src/tests/prefs_test.cpp 2021-12-05 14:18:53.000000000 -0800
++++ b/src/tests/prefs_test.cpp 2021-12-11 10:11:47.628808234 -0800
+@@ -191,7 +191,7 @@
+ QVERIFY(prefs.getWindowState() == WindowState::Normal);
+ QVERIFY(prefs.getSelectedTab() == list_view_type::MACHINE);
+ QVERIFY(prefs.getAuditingState() == AuditingState::Default);
+- QVERIFY(prefs.getGlobalPath(global_path_type::EMU_EXECUTABLE) == "");
++ QVERIFY(prefs.getGlobalPath(global_path_type::EMU_EXECUTABLE) ==
"/usr/bin/mame");
+ QVERIFY(prefs.getGlobalPath(global_path_type::ROMS) == "");
+ QVERIFY(prefs.getGlobalPath(global_path_type::SAMPLES) == "");
+ QVERIFY(prefs.getGlobalPath(global_path_type::CONFIG) ==
QDir::toNativeSeparators(tempDir.path()));
diff --git a/bletchmame-disable-broken-tests.patch
b/bletchmame-disable-broken-tests.patch
new file mode 100644
index 0000000..d92140b
--- /dev/null
+++ b/bletchmame-disable-broken-tests.patch
@@ -0,0 +1,78 @@
+diff --git a/src/tests/info_builder_test.cpp b/src/tests/info_builder_test.cpp
+index 1093d83..ca69534 100644
+--- a/src/tests/info_builder_test.cpp
++++ b/src/tests/info_builder_test.cpp
+@@ -19,8 +19,6 @@ namespace
+
+ private slots:
+ void general();
+- void compareBinaries_coco() {
compareBinaries(":/resources/listxml_coco.xml"); }
+- void compareBinaries_alienar() {
compareBinaries(":/resources/listxml_alienar.xml"); }
+
+ private:
+ void compareBinaries(const QString &fileName);
+@@ -100,64 +98,6 @@ void Test::general()
+ }
+
+
+-//-------------------------------------------------
+-// compareBinaries - perform a binary comparison
+-// to validate that byte for byte, the info DB we
+-// build is identical to whats there
+-//
+-// a caveat - info DB is (for now) endian sensitive,
+-// but in practice all of the platforms we care
+-// about are little endian
+-//-------------------------------------------------
+-
+-void Test::compareBinaries(const QString &fileName)
+-{
+- const bool dumpBinaries = false;
+-
+- // get the binaries
+- QByteArray byteArray = buildInfoDatabase(fileName);
+- QVERIFY(byteArray.size() > 0);
+-
+- // get the binary file name
+- QString binFileName = fileName;
+- binFileName.replace(".xml", ".bin");
+- QVERIFY(binFileName != fileName);
+-
+- // dump the binaries if appropriate
+- if (dumpBinaries)
+- {
+- int lastSlashPos = binFileName.lastIndexOf('/');
+- QVERIFY(lastSlashPos >= 0);
+- QString dumpBinFileName = binFileName.right(binFileName.size() - lastSlashPos - 1);
+-
+- QFile dumpFile(dumpBinFileName);
+- QVERIFY(dumpFile.open(QIODevice::WriteOnly));
+- dumpFile.write(byteArray);
+- }
+-
+- // read the binary file
+- QFile binFile(binFileName);
+- QVERIFY(binFile.open(QIODevice::ReadOnly));
+- QByteArray binByteArray = binFile.readAll();
+- binFile.close();
+-
+- // the moment of truth - is the binary that we built byte-for-byte identical to what is
there?
+- QVERIFY(byteArray.size() == binByteArray.size());
+- for (int i = 0; i < byteArray.size(); i++)
+- {
+- if (byteArray[i] != binByteArray[i])
+- {
+- qWarning("Difference at index #%d (0x%02X vs 0x%02X)",
+- (int)i,
+- (unsigned)(std::uint8_t)byteArray[i],
+- (unsigned)(std::uint8_t)binByteArray[i]);
+- break;
+- }
+- }
+- QVERIFY(byteArray == binByteArray);
+-}
+-
+-
+ //-------------------------------------------------
+
+ static TestFixture<Test> fixture;
diff --git a/bletchmame-quazip-version.patch b/bletchmame-quazip-version.patch
new file mode 100644
index 0000000..fd643e2
--- /dev/null
+++ b/bletchmame-quazip-version.patch
@@ -0,0 +1,22 @@
+From 3c5992c675313764b6766390107d134b7d6458c7 Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <davide(a)cavalca.name>
+Date: Sat, 11 Dec 2021 10:04:24 -0800
+Subject: [PATCH] Do not hardcode quazip version
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5df68ef..8b6370d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,7 @@ find_package(Qt6 COMPONENTS Widgets LinguistTools Core5Compat Test
REQUIRED)
+
+ # QuaZip
+ find_package(QuaZip-Qt6 REQUIRED)
+-include_directories(SYSTEM ${QuaZip-Qt6_DIR}/../../../include/QuaZip-Qt6-1.1/quazip)
++include_directories(SYSTEM
${QuaZip-Qt6_DIR}/../../../include/QuaZip-Qt6-${QuaZip-Qt6_VERSION}/quazip)
+ link_directories(${QuaZip-Qt6_DIR}/../../../lib)
+ if(NOT DEFINED QUAZIP_LIBRARIES)
+ set(QUAZIP_LIBRARIES quazip1-qt6)
diff --git a/bletchmame-tests-do-not-segfault-on-failure.patch
b/bletchmame-tests-do-not-segfault-on-failure.patch
deleted file mode 100644
index 437a661..0000000
--- a/bletchmame-tests-do-not-segfault-on-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b138be2d86c6317d55a3ec3cbda53033d60d3af9 Mon Sep 17 00:00:00 2001
-From: Davide Cavalca <davide(a)cavalca.name>
-Date: Sun, 24 Oct 2021 22:21:31 -0700
-Subject: [PATCH] tests: do not segfault on failure
-
----
- src/tests/test.cpp | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/src/tests/test.cpp b/src/tests/test.cpp
-index a81d701..e1cbeed 100644
---- a/src/tests/test.cpp
-+++ b/src/tests/test.cpp
-@@ -131,18 +131,5 @@ int main(int argc, char *argv[])
- result = runTestFixtures(argc, argv);
- }
-
-- // did we have any failures?
-- if (result != 0)
-- {
-- // the monstrosity below is a consequence of seemingly not being able to
-- // report errors with exit codes under GitHub actions; for some reason exit
-- // codes are not working but the code below does trigger a failure
-- size_t i = 0;
-- do
-- {
-- *((long *)i++) = 0xDEADBEEF;
-- } while (rand() != rand());
-- }
--
- return result;
- }
diff --git a/bletchmame.spec b/bletchmame.spec
index e56de29..700439a 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.9
+Version: 2.10
Release: %autorelease
Summary: MAME emulator frontend
@@ -11,8 +11,11 @@ Source0:
%{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: README.fedora
# Use the distribution MAME by default
Patch0: bletchmame-default-paths.patch
-# PR#219: tests: do not segfault on failure
-Patch1:
%{forgeurl}/pull/219.patch#/bletchmame-tests-do-not-segfault-on-failure.patch
+# PR#255: Do not hardcode quazip version
+Patch1: %{forgeurl}/pull/255.patch#/bletchmame-quazip-version.patch
+# Disable broken tests on 32 bit architectures
+#
https://github.com/npwoods/bletchmame/issues/256
+Patch2: bletchmame-disable-broken-tests.patch
# Temporarily disable due to missing dependencies
#
https://bugzilla.redhat.com/show_bug.cgi?id=2012824
@@ -30,7 +33,6 @@ BuildRequires: qt6-qttools-devel
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qt5compat-devel
BuildRequires: quazip-qt6-devel
-BuildRequires: sed
BuildRequires: zlib-devel
Recommends: mame
@@ -46,7 +48,14 @@ all machines supported by MAME, it should be particularly suitable to
computer
emulation.
%prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+# Disable broken tests on 32 bit architectures
+%ifarch armv7hl i686
+%patch2 -p1
+%endif
+
cp -p %{SOURCE1} .
# remove bundled libraries
@@ -66,7 +75,6 @@ EOF
%cmake \
-DUSE_SHARED_LIBS=ON \
-DBUILD_SHARED_LIBS=OFF \
- -DBUILD_STATIC_LIBS=OFF \
-DHAS_BUILDVERSION_GEN_CPP=1
%cmake_build
@@ -81,10 +89,7 @@ appstream-util validate-relax --nonet \
%{buildroot}%{_metainfodir}/%{name}.metainfo.xml
%check
-# Tests inconsistently fail on 32bit architectures
-%ifnarch armv7hl i686
%ctest
-%endif
%files
%license LICENSE.rtf
diff --git a/sources b/sources
index 3eecb36..9d59f8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.9.tar.gz) =
2a6c548e00742776a19f6fa180fe18cbdb8214e9af0078c8d065a103eadb507745ab57a73b20d7d0fa88f6a209b3ad3f0e86a864669ea4d4b4974aae2f0b1147
+SHA512 (bletchmame-2.10.tar.gz) =
ba72ba45716e4882bff29b959a673c373f3230f71e6b34a1ea5e4cbe05445bcbbf774d7845050b9092fafdca3d4b390edcfc54a502967f9edcf4ca99adff4d7f
commit 23474e9fe2a07ae8425aa69428e70838c2b9bef7
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Oct 31 09:19:22 2021 -0700
Temporarily gate out tests on 32 bit architectures
diff --git a/bletchmame.spec b/bletchmame.spec
index b8806e5..e56de29 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -15,7 +15,7 @@ Patch0: bletchmame-default-paths.patch
Patch1:
%{forgeurl}/pull/219.patch#/bletchmame-tests-do-not-segfault-on-failure.patch
# Temporarily disable due to missing dependencies
-#
https://bugzilla.redhat.com/show_bug.cgi?id=2016829
+#
https://bugzilla.redhat.com/show_bug.cgi?id=2012824
ExcludeArch: s390x
BuildRequires: gcc-c++
@@ -81,7 +81,10 @@ appstream-util validate-relax --nonet \
%{buildroot}%{_metainfodir}/%{name}.metainfo.xml
%check
+# Tests inconsistently fail on 32bit architectures
+%ifnarch armv7hl i686
%ctest
+%endif
%files
%license LICENSE.rtf
commit 99925300e4d6918b6472981cdeea5ebfdc0f0b8e
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Oct 24 22:26:50 2021 -0700
Fix tests on i686, temporarily gate out s390x
diff --git a/bletchmame-tests-do-not-segfault-on-failure.patch
b/bletchmame-tests-do-not-segfault-on-failure.patch
new file mode 100644
index 0000000..437a661
--- /dev/null
+++ b/bletchmame-tests-do-not-segfault-on-failure.patch
@@ -0,0 +1,32 @@
+From b138be2d86c6317d55a3ec3cbda53033d60d3af9 Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <davide(a)cavalca.name>
+Date: Sun, 24 Oct 2021 22:21:31 -0700
+Subject: [PATCH] tests: do not segfault on failure
+
+---
+ src/tests/test.cpp | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/src/tests/test.cpp b/src/tests/test.cpp
+index a81d701..e1cbeed 100644
+--- a/src/tests/test.cpp
++++ b/src/tests/test.cpp
+@@ -131,18 +131,5 @@ int main(int argc, char *argv[])
+ result = runTestFixtures(argc, argv);
+ }
+
+- // did we have any failures?
+- if (result != 0)
+- {
+- // the monstrosity below is a consequence of seemingly not being able to
+- // report errors with exit codes under GitHub actions; for some reason exit
+- // codes are not working but the code below does trigger a failure
+- size_t i = 0;
+- do
+- {
+- *((long *)i++) = 0xDEADBEEF;
+- } while (rand() != rand());
+- }
+-
+ return result;
+ }
diff --git a/bletchmame.spec b/bletchmame.spec
index b7d3c54..b8806e5 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -11,6 +11,12 @@ Source0:
%{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: README.fedora
# Use the distribution MAME by default
Patch0: bletchmame-default-paths.patch
+# PR#219: tests: do not segfault on failure
+Patch1:
%{forgeurl}/pull/219.patch#/bletchmame-tests-do-not-segfault-on-failure.patch
+
+# Temporarily disable due to missing dependencies
+#
https://bugzilla.redhat.com/show_bug.cgi?id=2016829
+ExcludeArch: s390x
BuildRequires: gcc-c++
BuildRequires: cmake
commit 6fa6c3f0203ff32e5ffefb527259d60d7efcdf66
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Oct 24 06:44:27 2021 -0700
Update to 2.9; Fixes: RHBZ#2016808
diff --git a/.gitignore b/.gitignore
index 91a447e..5b04fbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/bletchmame-46115fd097e04c249781ee2af49384577ec7ada8.tar.gz
/bletchmame-2.7.tar.gz
/bletchmame-2.8.tar.gz
+/bletchmame-2.9.tar.gz
diff --git a/bletchmame-default-paths.patch b/bletchmame-default-paths.patch
index edebd49..42f6bf1 100644
--- a/bletchmame-default-paths.patch
+++ b/bletchmame-default-paths.patch
@@ -1,8 +1,8 @@
diff -Naur a/src/prefs.cpp b/src/prefs.cpp
---- a/src/prefs.cpp 2021-08-29 09:59:35.000000000 -0700
-+++ b/src/prefs.cpp 2021-09-16 22:17:48.302238687 -0700
-@@ -158,6 +158,9 @@
- , m_selected_tab(list_view_type::MACHINE)
+--- a/src/prefs.cpp 2021-10-23 06:45:33.000000000 -0700
++++ b/src/prefs.cpp 2021-10-24 06:40:44.497811677 -0700
+@@ -184,6 +184,9 @@
+ , m_auditingState(AuditingState::Default)
{
// default paths
+ setGlobalPath(global_path_type::EMU_EXECUTABLE,
QDir::toNativeSeparators("/usr/bin/mame"));
@@ -11,10 +11,12 @@ diff -Naur a/src/prefs.cpp b/src/prefs.cpp
setGlobalPath(global_path_type::CONFIG, getConfigDirectory(true));
setGlobalPath(global_path_type::NVRAM, getConfigDirectory(true));
setGlobalPath(global_path_type::PLUGINS, getDefaultPluginsDirectory());
-@@ -896,5 +899,5 @@
+@@ -1090,7 +1093,7 @@
static QString getDefaultPluginsDirectory()
{
- return
QDir::toNativeSeparators("$(BLETCHMAMEPATH)/plugins/;$(MAMEPATH)/plugins/");
+ return
QDir::toNativeSeparators("/usr/share/bletchmame/plugins/;/usr/share/mame/plugins/");
}
+
+
diff --git a/bletchmame.spec b/bletchmame.spec
index df037e4..b7d3c54 100644
--- a/bletchmame.spec
+++ b/bletchmame.spec
@@ -1,7 +1,7 @@
%global forgeurl
https://github.com/npwoods/bletchmame
Name: bletchmame
-Version: 2.8
+Version: 2.9
Release: %autorelease
Summary: MAME emulator frontend
diff --git a/sources b/sources
index cbfa2d7..3eecb36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bletchmame-2.8.tar.gz) =
3721da5c05d45b2608b26b5503921eba68405cb38247a818ccefda6f8d2d500531a84451a851eccc4ee03a4c689060ccc97072546c6d846d1640ca4f9169661d
+SHA512 (bletchmame-2.9.tar.gz) =
2a6c548e00742776a19f6fa180fe18cbdb8214e9af0078c8d065a103eadb507745ab57a73b20d7d0fa88f6a209b3ad3f0e86a864669ea4d4b4974aae2f0b1147