Hello community, here is the log from the commit of package adlmidi for openSUSE:Factory checked in at 2020-10-06 17:15:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adlmidi (Old) and /work/SRC/openSUSE:Factory/.adlmidi.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adlmidi" Tue Oct 6 17:15:37 2020 rev:3 rq:839782 version:1.2.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/adlmidi/adlmidi.changes 2019-11-06 13:52:11.715902066 +0100 +++ /work/SRC/openSUSE:Factory/.adlmidi.new.4249/adlmidi.changes 2020-10-06 17:16:43.993817113 +0200 @@ -1,0 +2,6 @@ +Tue Oct 6 08:40:27 UTC 2020 - Guillaume GARDET <[email protected]> + +- Fix build on Arm and ppc: + * adlmidi-fix-arm.patch + +------------------------------------------------------------------- New: ---- adlmidi-fix-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adlmidi.spec ++++++ --- /var/tmp/diff_new_pack.2gTFUJ/_old 2020-10-06 17:16:44.577817609 +0200 +++ /var/tmp/diff_new_pack.2gTFUJ/_new 2020-10-06 17:16:44.581817612 +0200 @@ -1,7 +1,7 @@ # # spec file for package adlmidi # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2019, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -25,6 +25,8 @@ URL: https://bisqwit.iki.fi/source/adlmidi.html #Git-Clone: https://github.com/bisqwit/adlmidi.git Source: https://bisqwit.iki.fi/src/arch/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM +Patch1: adlmidi-fix-arm.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(sdl2) @@ -35,6 +37,7 @@ %prep %setup -q +%patch1 -p1 sed -i 's|-march=native||' Makefile %build ++++++ adlmidi-fix-arm.patch ++++++ --- adlmidi-1.2.6.2/puzzlegame.inc.orig 2020-10-06 10:37:55.001815403 +0200 +++ adlmidi-1.2.6.2/puzzlegame.inc 2020-10-06 10:38:10.965969535 +0200 @@ -31,7 +31,7 @@ namespace ADLMIDI_PuzzleGame static unsigned long TimerRead() { - static std::chrono::time_point<std::chrono::system_clock> begin = std::chrono::system_clock::now(); + static std::chrono::time_point<std::chrono::system_clock> begin = std::chrono::system_clock::now(); return 519 * std::chrono::duration<double>( std::chrono::system_clock::now() - begin ).count(); } #define Timer TimerRead() @@ -376,7 +376,7 @@ namespace ADLMIDI_PuzzleGame // Find out the extents of this piece, and how many // cells of the piece contribute into full (completed) rows. - char full[4]={-1,-1,-1,-1}; + signed char full[4]={-1,-1,-1,-1}; int miny=n.y+9, maxy=n.y-9, minx=n.x+9, maxx=n.x-9, num_eroded=0; n>[&](int x,int y) -> bool { if(x < minx) {minx = x;} if(x > maxx) {maxx = x;}
