Hello community,
here is the log from the commit of package mame for openSUSE:Factory checked in at 2019-03-19 10:02:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mame (Old)
and /work/SRC/openSUSE:Factory/.mame.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mame"
Tue Mar 19 10:02:35 2019 rev:14 rq:686199 version:0.207
Changes:
--------
--- /work/SRC/openSUSE:Factory/mame/mame.changes 2019-03-01 16:47:15.473802892 +0100
+++ /work/SRC/openSUSE:Factory/.mame.new.28833/mame.changes 2019-03-19 10:02:40.195819919 +0100
@@ -1,0 +2,16 @@
+Mon Mar 18 04:43:03 UTC 2019 - Stefan Brüns
+
+- Set memory-per-cpu to 1.6 GByte, builds fail occasionaly
+- Increase disk constraints by 2 GByte to 42 GByte
+- Fix failing builds due to missing Makefile dependency, gh#mamedev/mame#4771:
+ Add add_tms57002_hxx_dependecy.patch
+- Correct Url: to use https:
+- Use %license
+
+-------------------------------------------------------------------
+Sun Mar 17 21:25:56 UTC 2019 - Jan Engelhardt
+
+- Replace open-coded memory limiter by %limit_build
+ (available in all supported versions; that is, >= 42.3:Update)
+
+-------------------------------------------------------------------
New:
----
add_tms57002_hxx_dependecy.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mame.spec ++++++
--- /var/tmp/diff_new_pack.I3ykif/_old 2019-03-19 10:02:42.615817778 +0100
+++ /var/tmp/diff_new_pack.I3ykif/_new 2019-03-19 10:02:42.619817774 +0100
@@ -16,28 +16,12 @@
#
-# Memory limit helper
-%define smp_limit_kb_per_job() %( \
- kb_per_cpu=%1 \
- memtotal=$(sed "/MemTotal/ { s/MemTotal: \\+\\(.\\+\\) kB/\\1/ ; p } ; d" < /proc/meminfo) \
- jobs=$(( $memtotal / $kb_per_cpu )) \
- [ $jobs -lt 1 ] && jobs=1 \
- echo $jobs \
-)
-# Limit to 1 job per 1400000 kByte (1.4 GByte)
-%define _smp_ncpus_max %{smp_limit_kb_per_job 1400000}
-# The build script hardcodes _smp_mflags to "-j_jobs", make it more useful
-%define _smp_mflags %( \
- jobs=0%{?jobs}; \
- [ "$jobs" -lt 1 ] && jobs="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \
- ncpus_max=%{?_smp_ncpus_max}; \
- if [ "$jobs" -gt "$ncpus_max" ]; then jobs="$ncpus_max"; fi; \
- if [ "$jobs" -gt 1 ]; then echo "-j$jobs"; fi)
-
%define fver 207
-# To build these, change to bcond_without
+
+# Build mame-mess by default, and use system libraries
%bcond_without mess
%bcond_without systemlibs
+
Name: mame
Version: 0.%fver
Release: 0
@@ -53,9 +37,12 @@
Source101: mame.ini.in
Source102: mame.appdata.xml
Source104: mame-mess.appdata.xml
+# PATCH-FIX-UPSTREAM stefan.bruens@rwth-aachen.de gh#mamedev/mame#4771 -- Add a messing dependency on generated file
+Patch0: add_tms57002_hxx_dependecy.patch
Patch1: fix_mkdir_order.patch
BuildRequires: binutils-gold
BuildRequires: fdupes
+BuildRequires: memory-constraints
BuildRequires: pkgconfig
BuildRequires: python-xml
BuildRequires: update-desktop-files
@@ -149,6 +136,7 @@
%prep
%setup -q -n mame-mame0%fver
+%patch0 -p0
%patch1 -p0
cp %{SOURCE1} whatsnew-%{version}.txt
@@ -171,6 +159,7 @@
sed -i "s@\. -s@\. %{myoptflags}@" 3rdparty/genie/build/gmake.linux/genie.make
%build
+%limit_build -m 1600
# Memory mapped files occupy the limited 32bit address space
%ifarch %ix86 %arm
export LDFLAGS="${LDFLAGS} -Wl,-v -fuse-ld=gold -Wl,--no-keep-files-mapped -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
@@ -303,9 +292,8 @@
%desktop_database_postun
%files
-%defattr(-,root,root,-)
-%doc LICENSE.md README.md whatsnew-%{version}.txt
-%doc docs/LICENSE
+%doc README.md whatsnew-%{version}.txt
+%license docs/LICENSE LICENSE.md
%{_bindir}/mame
%{_datadir}/pixmaps/mame.png
%{_datadir}/applications/mame.desktop
@@ -317,9 +305,8 @@
%endif
%files data
-%defattr(-,root,root,-)
-%doc LICENSE.md README.md
-%doc docs/LICENSE
+%doc README.md
+%license docs/LICENSE LICENSE.md
%{_datadir}/mame/
%dir %{_sysconfdir}/skel/.mame
%dir %{_sysconfdir}/skel/.mess
@@ -327,9 +314,7 @@
%config(noreplace) %{_sysconfdir}/skel/.mess/mess.ini
%files tools
-%defattr(-,root,root,-)
-%doc LICENSE.md README.md
-%doc docs/LICENSE
+%license docs/LICENSE LICENSE.md
%{_bindir}/castool
%{_bindir}/chdman
%{_bindir}/floptool
@@ -357,9 +342,8 @@
%if %{with mess}
%files mess
-%doc LICENSE.md README.md whatsnew-%{version}.txt
-%doc docs/LICENSE
-%defattr(-,root,root)
+%doc README.md whatsnew-%{version}.txt
+%license docs/LICENSE LICENSE.md
%{_bindir}/mame-mess
%{_datadir}/pixmaps/mame-mess.png
%{_datadir}/applications/mame-mess.desktop
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.I3ykif/_old 2019-03-19 10:02:42.659817739 +0100
+++ /var/tmp/diff_new_pack.I3ykif/_new 2019-03-19 10:02:42.663817736 +0100
@@ -2,10 +2,13 @@
<hardware>
<processors>4</processors>
<disk>
- <size unit="G">40</size>
+ <size unit="G">42</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
+ <memory>
+ <size unit="G">11</size>
+ </memory>
</hardware>
</constraints>
++++++ add_tms57002_hxx_dependecy.patch ++++++
--- scripts/src/cpu.lua_orig 2019-03-18 05:37:55.895543947 +0100
+++ scripts/src/cpu.lua 2019-03-18 05:39:24.472487801 +0100
@@ -2403,6 +2403,8 @@
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
{ MAME_DIR .. "src/devices/cpu/tms57002/tmsops.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
+ { MAME_DIR .. "src/mame/drivers/konamigq.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
+ { MAME_DIR .. "src/mame/drivers/konamigx.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
}
custombuildtask {
{ MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }