rpm/adlmidi
SHA256
1
0
Fork 0
forked from pool/adlmidi
Code Pull Requests Activity

Accepting request 839726 from home:Guillaume_G:branches:multimedia:apps

Browse Source 
- 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
This commit is contained in:
Martin Hauke 2020-10-06 12:02:35 +00:00 committed by Git OBS Bridge
parent 27fef84654
commit 2f04a20371
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
adlmidi-fix-arm.patch Normal file
View File

@ -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<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;}

6
adlmidi.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 6 08:40:27 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix build on Arm and ppc:
* adlmidi-fix-arm.patch
-------------------------------------------------------------------
Thu Oct 17 12:53:26 UTC 2019 - Richard Brown <rbrown@suse.com>

5
adlmidi.spec
View File

@ -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 <mardnh@gmx.de>
#
# 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