Hello community, here is the log from the commit of package mame for openSUSE:Factory checked in at 2018-07-02 23:32:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mame (Old) and /work/SRC/openSUSE:Factory/.mame.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mame" Mon Jul 2 23:32:09 2018 rev:9 rq:619828 version:0.199 Changes: -------- --- /work/SRC/openSUSE:Factory/mame/mame.changes 2018-02-10 17:59:33.693103658 +0100 +++ /work/SRC/openSUSE:Factory/.mame.new/mame.changes 2018-07-02 23:32:53.225291146 +0200 @@ -1,0 +2,29 @@ +Fri Jun 29 16:28:50 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix build on 32bit ARM architectures: + 0001-Avoid-multiple-explicit-instantiations-definition-of.patch + +------------------------------------------------------------------- +Thu Jun 28 19:25:29 UTC 2018 - mar...@gmx.de + +- Update to version 0.199 + See + http://mamedev.org/releases/whatsnew_0199.txt + +------------------------------------------------------------------- +Wed Jun 27 13:42:10 UTC 2018 - mar...@gmx.de + +- Update to version 0.198 + See + http://mamedev.org/releases/whatsnew_0198.txt + http://mamedev.org/releases/whatsnew_0197.txt + http://mamedev.org/releases/whatsnew_0196.txt + http://mamedev.org/releases/whatsnew_0195.txt + http://mamedev.org/releases/whatsnew_0194.txt + for details +- Remove patch: + * treat_gcc73_and_later_like_gcc72.patch (fixed upstream) +- Change build requirements gcc7-c++ to fix compilation on + Leap 42.3. + +------------------------------------------------------------------- Old: ---- mame0193.tar.gz treat_gcc73_and_later_like_gcc72.patch whatsnew_0193.txt New: ---- 0001-Avoid-multiple-explicit-instantiations-definition-of.patch mame0199.tar.gz whatsnew_0199.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mame.spec ++++++ --- /var/tmp/diff_new_pack.4ySW1n/_old 2018-07-02 23:33:05.157276363 +0200 +++ /var/tmp/diff_new_pack.4ySW1n/_new 2018-07-02 23:33:05.157276363 +0200 @@ -34,7 +34,7 @@ if [ "$jobs" -gt "$ncpus_max" ]; then jobs="$ncpus_max"; fi; \ if [ "$jobs" -gt 1 ]; then echo "-j$jobs"; fi) -%define fver 193 +%define fver 199 # To build these, change to bcond_without %bcond_without mess %bcond_without systemlibs @@ -42,7 +42,7 @@ Version: 0.%fver Release: 0 Summary: Multiple Arcade Machine Emulator -License: GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause Group: System/Emulators/Other Url: http://mamedev.org/ Source0: https://github.com/mamedev/mame/archive/mame0%{fver}.tar.gz @@ -53,7 +53,7 @@ Source101: mame.ini.in Source102: mame.appdata.xml Source104: mame-mess.appdata.xml -Patch0: treat_gcc73_and_later_like_gcc72.patch +Patch0: 0001-Avoid-multiple-explicit-instantiations-definition-of.patch Patch1: fix_mkdir_order.patch BuildRequires: binutils-gold BuildRequires: fdupes @@ -72,7 +72,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %if 0%{?suse_version} <= 1315 -BuildRequires: gcc5-c++ +BuildRequires: gcc7-c++ %else BuildRequires: gcc-c++ %endif @@ -189,8 +189,8 @@ VERBOSE=1 \ OPTIMIZE=3 \ %if 0%{?suse_version} <= 1315 - OVERRIDE_CC=gcc-5 \ - OVERRIDE_CXX=g++-5 \ + OVERRIDE_CC=gcc-7 \ + OVERRIDE_CXX=g++-7 \ %endif %if %{with systemlibs} USE_SYSTEM_LIB_EXPAT=1 \ ++++++ 0001-Avoid-multiple-explicit-instantiations-definition-of.patch ++++++ >From 647a7498088d3c0dfeb04c5bdeb299bb5e6464d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Fri, 29 Jun 2018 18:25:56 +0200 Subject: [PATCH] Avoid multiple explicit instantiations definition of templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the C++ standard 14.7 clause 5, "an explicit instantiation definition shall appear at most once in a program". Move the instantiation from the individual implementation files to the interface implementation file. Signed-off-by: Stefan Brüns <stefan.bru...@rwth-aachen.de> --- src/devices/bus/coco/coco_dcmodem.cpp | 2 -- src/devices/bus/coco/coco_gmc.cpp | 2 -- src/devices/bus/coco/coco_multi.cpp | 2 -- src/devices/bus/coco/coco_orch90.cpp | 2 -- src/devices/bus/coco/coco_rs232.cpp | 2 -- src/devices/bus/coco/coco_ssc.cpp | 2 -- src/devices/bus/coco/coco_t4426.cpp | 2 -- src/devices/bus/coco/cococart.cpp | 3 +++ src/devices/bus/coco/dragon_fdc.cpp | 3 --- src/devices/bus/ss50/interface.cpp | 3 +++ src/devices/bus/ss50/mpc.cpp | 2 -- src/devices/bus/ss50/mps.cpp | 2 -- 12 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index d4cba829..d1555215 100644 --- a/src/devices/bus/coco/coco_dcmodem.cpp +++ b/src/devices/bus/coco/coco_dcmodem.cpp @@ -101,8 +101,6 @@ ROM_START(coco_dcmodem) ROM_END DEFINE_DEVICE_TYPE_PRIVATE(COCO_DCMODEM, device_cococart_interface, coco_dc_modem_device, "coco_dcmodem", "CoCo Direct Connect Modem PAK") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; //------------------------------------------------- diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp index 310e037f..706bdf3c 100644 --- a/src/devices/bus/coco/coco_gmc.cpp +++ b/src/devices/bus/coco/coco_gmc.cpp @@ -63,8 +63,6 @@ MACHINE_CONFIG_END //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_GMC, device_cococart_interface, coco_pak_gmc_device, "cocopakgmc", "CoCo Games Master Cartridge") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; //------------------------------------------------- // coco_pak_device - constructor diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 6f42c45d..e8ae24c7 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -214,8 +214,6 @@ INPUT_PORTS_END //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(COCO_MULTIPAK, device_cococart_interface, coco_multipak_device, "coco_multipack", "CoCo Multi-Pak Interface") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index f1dcdf3f..979acd42 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -123,5 +123,3 @@ MACHINE_CONFIG_END //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(COCO_ORCH90, device_cococart_interface, coco_orch90_device, "coco_orch90", "CoCo Orch-90 PAK") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp index 914b5f9c..774ab1a9 100644 --- a/src/devices/bus/coco/coco_rs232.cpp +++ b/src/devices/bus/coco/coco_rs232.cpp @@ -112,5 +112,3 @@ const tiny_rom_entry *coco_rs232_device::device_rom_region() const //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(COCO_RS232, device_cococart_interface, coco_rs232_device, "coco_rs232", "CoCo Deluxe RS-232 PAK") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index b79e82c7..eff344b2 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -146,8 +146,6 @@ namespace DEFINE_DEVICE_TYPE_PRIVATE(COCO_SSC, device_cococart_interface, coco_ssc_device, "coco_ssc", "CoCo S/SC PAK"); DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sound Activity Circuit"); -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; //************************************************************************** diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 896b5ef9..988ddd02 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -225,8 +225,6 @@ INPUT_PORTS_END //************************************************************************** DEFINE_DEVICE_TYPE_PRIVATE(COCO_T4426, device_cococart_interface, coco_t4426_device, "coco_t4426", "Terco CNC Programming Station 4426 multi cart") -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index 30ac0b04..93d1c424 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -447,6 +447,9 @@ std::string cococart_slot_device::get_default_card_software(get_default_card_sof // CoCo cartridge slots //************************************************************************** +template class device_finder<device_cococart_interface, false>; +template class device_finder<device_cococart_interface, true>; + //------------------------------------------------- // device_cococart_interface - constructor //------------------------------------------------- diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index cbaf7a32..9ca1758b 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -86,9 +86,6 @@ #define WD2797_TAG "wd2797" -template class device_finder<device_cococart_interface, false>; -template class device_finder<device_cococart_interface, true>; - /*************************************************************************** TYPE DEFINITIONS diff --git a/src/devices/bus/ss50/interface.cpp b/src/devices/bus/ss50/interface.cpp index 2beb4e85..b17f54f9 100644 --- a/src/devices/bus/ss50/interface.cpp +++ b/src/devices/bus/ss50/interface.cpp @@ -203,6 +203,9 @@ WRITE_LINE_MEMBER(ss50_interface_port_device::f600_1200_w) // SS-50 CARD INTERFACE //************************************************************************** +template class device_finder<ss50_card_interface, false>; +template class device_finder<ss50_card_interface, true>; + //------------------------------------------------- // ss50_card_interface - construction //------------------------------------------------- diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp index 40fbf4a7..8489e23e 100644 --- a/src/devices/bus/ss50/mpc.cpp +++ b/src/devices/bus/ss50/mpc.cpp @@ -191,5 +191,3 @@ WRITE_LINE_MEMBER(ss50_mpc_device::f300_w) // device type definition DEFINE_DEVICE_TYPE_PRIVATE(SS50_MPC, ss50_card_interface, ss50_mpc_device, "ss50_mpc", "MP-C Serial Control Interface") -template class device_finder<ss50_card_interface, false>; -template class device_finder<ss50_card_interface, true>; diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp index d15b7288..7f6479db 100644 --- a/src/devices/bus/ss50/mps.cpp +++ b/src/devices/bus/ss50/mps.cpp @@ -180,5 +180,3 @@ WRITE_LINE_MEMBER(ss50_mps_device::acia_irq_w) // device type definition DEFINE_DEVICE_TYPE_PRIVATE(SS50_MPS, ss50_card_interface, ss50_mps_device, "ss50_mps", "MP-S Serial Interface") -template class device_finder<ss50_card_interface, false>; -template class device_finder<ss50_card_interface, true>; -- 2.18.0 ++++++ mame0193.tar.gz -> mame0199.tar.gz ++++++ /work/SRC/openSUSE:Factory/mame/mame0193.tar.gz /work/SRC/openSUSE:Factory/.mame.new/mame0199.tar.gz differ: char 41, line 1 ++++++ whatsnew_0193.txt -> whatsnew_0199.txt ++++++ ++++ 687 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mame/whatsnew_0193.txt ++++ and /work/SRC/openSUSE:Factory/.mame.new/whatsnew_0199.txt
