From 2f04a20371f0cd90d5a07015490b8ef12275966ecb6f97a5987cb864fdf0a5ed Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Tue, 6 Oct 2020 12:02:35 +0000 Subject: [PATCH] Accepting request 839726 from home:Guillaume_G:branches:multimedia:apps - Fix build on Arm and ppc: * adlmidi-fix-arm.patch OBS-URL: https://build.opensuse.org/request/show/839726 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/adlmidi?expand=0&rev=5 --- adlmidi-fix-arm.patch | 20 ++++++++++++++++++++ adlmidi.changes | 6 ++++++ adlmidi.spec | 5 ++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 adlmidi-fix-arm.patch diff --git a/adlmidi-fix-arm.patch b/adlmidi-fix-arm.patch new file mode 100644 index 0000000..47d9322 --- /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 3744be8..674a8d1 100644 --- a/adlmidi.changes +++ b/adlmidi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/adlmidi.spec b/adlmidi.spec index fd9534c..9d84526 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