diff --git a/.files b/.files index efa4641..3d0cdca 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index ea4452d..8d5f3ba 100644 --- a/.rev +++ b/.rev @@ -15,4 +15,12 @@ 739476 + + 02c37e86b691309118e965e6f1e60c9a + 1.2.6.2 + + dimstar_suse + + 839782 + diff --git a/adlmidi-fix-arm.patch b/adlmidi-fix-arm.patch new file mode 100644 index 0000000..e8d7a66 --- /dev/null +++ b/adlmidi-fix-arm.patch @@ -0,0 +1,20 @@ +--- 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 begin = std::chrono::system_clock::now(); ++ static std::chrono::time_point begin = std::chrono::system_clock::now(); + return 519 * std::chrono::duration( 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;} diff --git a/adlmidi.changes b/adlmidi.changes index 8545482..fa2c363 100644 --- a/adlmidi.changes +++ b/adlmidi.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 6 08:40:27 UTC 2020 - Guillaume GARDET + +- Fix build on Arm and ppc: + * adlmidi-fix-arm.patch + +------------------------------------------------------------------- Thu Oct 17 12:53:26 UTC 2019 - Richard Brown - Remove obsolete Groups tag (fate#326485) diff --git a/adlmidi.spec b/adlmidi.spec index d1f5764..27e994b 100644 --- a/adlmidi.spec +++ b/adlmidi.spec @@ -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 # # All modifications and additions to the file contributed by third parties @@ -25,6 +25,8 @@ License: GPL-3.0-only AND GPL-2.0-or-later 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 @@ OPL3 emulation (FM synthesis). %prep %setup -q +%patch1 -p1 sed -i 's|-march=native||' Makefile %build