Hello community, here is the log from the commit of package mame for openSUSE:Factory checked in at 2020-12-01 14:22:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mame (Old) and /work/SRC/openSUSE:Factory/.mame.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mame" Tue Dec 1 14:22:14 2020 rev:21 rq:851793 version:0.226 Changes: -------- --- /work/SRC/openSUSE:Factory/mame/mame.changes 2019-12-16 15:20:02.567147304 +0100 +++ /work/SRC/openSUSE:Factory/.mame.new.5913/mame.changes 2020-12-01 14:22:15.717559263 +0100 @@ -1,0 +2,29 @@ +Mon Nov 23 01:07:34 UTC 2020 - Avindra Goolcharan <avin...@opensuse.org> + +- Update to version 0.226 + * see https://mametesters.org/changelog_page.php for notes +- partial cleanup with spec-cleaner + +------------------------------------------------------------------- +Fri Jun 19 04:35:58 UTC 2020 - Michel Normand <norm...@linux.vnet.ibm.com> + +- Changes for ppc64/ppc64le builds: + - Reduce build memory _constraints to match PowerPC workers + - Reduce number of parallel build threads to avoid oom + - Disable lto for for same reason. + - New fix-922619.patch https://github.com/mamedev/mame/issues/3157 + +------------------------------------------------------------------- +Fri Jun 5 16:25:23 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix build of tool subpackage, src2html was removed in 0220. + +------------------------------------------------------------------- +Sun Apr 12 22:25:06 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Update to version 0.220 + See http://mamedev.org/releases/whatsnew_0220.txt for details +- Drop patch: + * fix_mkdir_order.patch (fixed by upstream) + +------------------------------------------------------------------- Old: ---- fix_mkdir_order.patch mame0211.tar.gz whatsnew_0211.txt New: ---- fix-922619.patch mame0226.tar.gz whatsnew_0226.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mame.spec ++++++ --- /var/tmp/diff_new_pack.yuh5Sy/_old 2020-12-01 14:22:22.601566710 +0100 +++ /var/tmp/diff_new_pack.yuh5Sy/_new 2020-12-01 14:22:22.601566710 +0100 @@ -1,7 +1,7 @@ # # spec file for package mame # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,6 +18,12 @@ %global flavor @BUILD_FLAVOR@%{nil} +# disable lto for ppc64/ppc64le +# as not enough resources today in OBS +%ifarch ppc64 ppc64le +%define _lto_cflags %{nil} +%endif + %if %{__isa_bits} == 64 %define is_64bit 1 %endif @@ -32,7 +38,7 @@ %define pkgsuffix -%{flavor} %endif -%define fver 211 +%define fver 226 # Build mame-mess by default, and use system libraries %bcond_without systemlibs @@ -42,12 +48,14 @@ Release: 0 %if "%{flavor}" != "mess" Summary: Multiple Arcade Machine Emulator +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause +Group: System/Emulators/Other %else Summary: Multi Emulator Super System -%endif License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause Group: System/Emulators/Other -URL: http://mamedev.org/ +%endif +URL: https://mamedev.org/ Source0: https://github.com/mamedev/mame/archive/mame0%{fver}.tar.gz Source1: https://github.com/mamedev/mame/releases/download/mame0%{fver}/whatsnew_0%{fver}.txt Source2: mame.png @@ -58,9 +66,10 @@ Source104: mame-mess.appdata.xml # PATCH-FIX-UPSTREAM stefan.bru...@rwth-aachen.de gh#mamedev/mame#4771 -- Add a missing dependency on generated file Patch0: add_tms57002_hxx_dependecy.patch -Patch1: fix_mkdir_order.patch # PATCH-FIX-OPENSUSE -- use thin archives for static libraries Patch2: use_thin_archives.patch +# details: https://github.com/mamedev/mame/issues/3157 +Patch3: fix-922619.patch BuildRequires: binutils-gold BuildRequires: fdupes BuildRequires: memory-constraints @@ -135,8 +144,8 @@ %package -n mame-tools Summary: MAME Tools -Group: System/Emulators/Other # mess-tools was last used at version 0.159 +Group: System/Emulators/Other Provides: mess-tools = %{version} Obsoletes: mess-tools < %{version} @@ -156,14 +165,14 @@ * languages %prep -%setup -q -n mame-mame0%fver -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%setup -q -n mame-mame0%{fver} +%patch0 +%patch2 +%patch3 -p1 cp %{SOURCE1} whatsnew-%{version}.txt # Fix rpmlint warning "wrong-file-end-of-line-encoding" -sed -i 's/\r$//' LICENSE.md README.md whatsnew-%{version}.txt +sed -i 's/\r$//' COPYING README.md whatsnew-%{version}.txt # Set DATADIR and SYSCONFDIR in ini files sed -e "s,@DATADIR@,%{_datadir},g"\ @@ -181,7 +190,12 @@ sed -i "s@\. -s@\. %{myoptflags}@" 3rdparty/genie/build/gmake.linux/genie.make %build -%limit_build -m 1800 +%ifarch ppc64 ppc64le +%define limitbuild 3000 +%else +%define limitbuild 1800 +%endif +%limit_build -m %{limitbuild} # Memory mapped files occupy the limited 32bit address space %if ! 0%{?is_64bit} @@ -217,20 +231,20 @@ %endif " # Bootstrap genie, scripts file has been patched -make %{?_smp_mflags} OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS genie +%make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS genie (cd 3rdparty/genie/; bin/linux/genie embed) -make %{?_smp_mflags} OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS genie +%make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS genie # Build the emulator itself %if "%{flavor}" == "mame" -make %{?_smp_mflags} OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=arcade TOOLS=0 +%make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=arcade TOOLS=0 %endif %if "%{flavor}" == "mess" -make %{?_smp_mflags} OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=mess TOOLS=0 +%make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=mess TOOLS=0 %endif %if "%{flavor}" == "tools-data" # Tiny still builds too much, but is the smallest target available for just building the tools -make %{?_smp_mflags} OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=tiny TOOLS=1 +%make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS SUBTARGET=tiny TOOLS=1 %endif %install @@ -268,7 +282,7 @@ install -dm 0755 %{buildroot}%{_bindir} install -pm 0755 castool chdman floptool imgtool jedutil ldresample \ ldverify romcmp unidasm %{buildroot}%{_bindir}/ -for mame_tool in nltool nlwav pngcmp regrep split src2html srcclean +for mame_tool in nltool nlwav pngcmp regrep split srcclean do install -pm 0755 $mame_tool %{buildroot}%{_bindir}/mame-${mame_tool} done @@ -291,7 +305,7 @@ install -pm 0644 hash/* %{emu_data_dir}/hash/ install -pm 0644 uismall.bdf %{emu_data_dir}/uismall.bdf -install -pm 0644 keymaps/{LICENSE,README.md} %{emu_data_dir}/keymaps/ +install -pm 0644 keymaps/README.md %{emu_data_dir}/keymaps/ install -pm 0644 keymaps/*LINUX.map %{emu_data_dir}/keymaps/ cp -ar language %{emu_data_dir}/ find %{emu_data_dir}/language/ -name "*.po" -delete @@ -310,7 +324,7 @@ %if "%{flavor}" == "mame" || "%{flavor}" == "mess" %files %doc README.md whatsnew-%{version}.txt -%license docs/LICENSE LICENSE.md +%license docs/LICENSE COPYING %{_bindir}/mame* %{_datadir}/pixmaps/mame*.png %{_datadir}/applications/mame*.desktop @@ -318,17 +332,17 @@ %config(noreplace) %{_sysconfdir}/skel/.*/*.ini %dir %{_datadir}/metainfo %{_datadir}/metainfo/mame*.appdata.xml -%{_mandir}/man6/mame*.6%{ext_man} +%{_mandir}/man6/mame*.6%{?ext_man} %endif %if "%{flavor}" == "tools-data" %files -n mame-data %doc README.md -%license docs/LICENSE LICENSE.md +%license docs/LICENSE COPYING %{_datadir}/mame/ %files -n mame-tools -%license docs/LICENSE LICENSE.md +%license docs/LICENSE COPYING %{_bindir}/castool %{_bindir}/chdman %{_bindir}/floptool @@ -341,18 +355,17 @@ %{_bindir}/mame-pngcmp %{_bindir}/mame-regrep %{_bindir}/mame-split -%{_bindir}/mame-src2html %{_bindir}/mame-srcclean %{_bindir}/romcmp %{_bindir}/unidasm -%{_mandir}/man1/castool.1%{ext_man} -%{_mandir}/man1/chdman.1%{ext_man} -%{_mandir}/man1/floptool.1%{ext_man} -%{_mandir}/man1/imgtool.1%{ext_man} -%{_mandir}/man1/jedutil.1%{ext_man} -%{_mandir}/man1/ldresample.1%{ext_man} -%{_mandir}/man1/ldverify.1%{ext_man} -%{_mandir}/man1/romcmp.1%{ext_man} +%{_mandir}/man1/castool.1%{?ext_man} +%{_mandir}/man1/chdman.1%{?ext_man} +%{_mandir}/man1/floptool.1%{?ext_man} +%{_mandir}/man1/imgtool.1%{?ext_man} +%{_mandir}/man1/jedutil.1%{?ext_man} +%{_mandir}/man1/ldresample.1%{?ext_man} +%{_mandir}/man1/ldverify.1%{?ext_man} +%{_mandir}/man1/romcmp.1%{?ext_man} %endif %changelog ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.yuh5Sy/_old 2020-12-01 14:22:22.641566753 +0100 +++ /var/tmp/diff_new_pack.yuh5Sy/_new 2020-12-01 14:22:22.641566753 +0100 @@ -13,7 +13,6 @@ <conditions> <arch>aarch64</arch> <arch>x86_64</arch> - <arch>ppc64le</arch> <package>mame:mame</package> </conditions> <hardware> @@ -26,11 +25,10 @@ </hardware> </overwrite> -<overwrite> + <overwrite> <conditions> <arch>aarch64</arch> <arch>x86_64</arch> - <arch>ppc64le</arch> <package>mame:mess</package> </conditions> <hardware> @@ -42,4 +40,22 @@ </memory> </hardware> </overwrite> + + <overwrite> + <conditions> + <arch>ppc64</arch> + <arch>ppc64le</arch> + <package>mame:mame</package> + <package>mame:mess</package> + </conditions> + <hardware> + <disk> + <size unit="G">34</size> + </disk> + <physicalmemory> + <size unit="M">11264</size> + </physicalmemory> + </hardware> + </overwrite> + </constraints> ++++++ fix-922619.patch ++++++ Description: Fix FTBFS on power "not a constant expression" There are some explanation upstream : https://github.com/mamedev/mame/issues/3157 and this probably due to the fact that IBM 128bit long double format is not constant folded. I slighlty rewrote ""_kHz_XTAL(long double clock) and ""_MHz_XTAL(long double clock) the way ""_kHz_XTAL(unsigned long long clock) and ""_MHz_XTAL(unsigned long long clock) which makes the compiler happy. Also including an upstream change about rounding to get same results as on x86 : https://github.com/mamedev/mame/pull/5164 Author: Frédéric Bonnard <fre...@debian.org> --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ As per comments in above issue#3157, this patch not accepted upstream, but allow ppc64le to build. --- a/src/emu/xtal.h +++ b/src/emu/xtal.h @@ -81,8 +81,8 @@ 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)); } -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)); } +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); } 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); } ++++++ mame0211.tar.gz -> mame0226.tar.gz ++++++ /work/SRC/openSUSE:Factory/mame/mame0211.tar.gz /work/SRC/openSUSE:Factory/.mame.new.5913/mame0226.tar.gz differ: char 12, line 1 ++++++ whatsnew_0211.txt -> whatsnew_0226.txt ++++++ ++++ 2462 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mame/whatsnew_0211.txt ++++ and /work/SRC/openSUSE:Factory/.mame.new.5913/whatsnew_0226.txt _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
