jengelh/omnispeak
SHA256
1
0
Fork 0
forked from pool/omnispeak
Code Pull Requests Activity

- Add 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/omnispeak?expand=0&rev=2
This commit is contained in:
Jan Engelhardt 2023-03-23 09:40:51 +00:00 committed by Git OBS Bridge
parent 8dcc293bc7
commit e08acee293
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch Normal file
View File

@ -0,0 +1,38 @@
From 6bd9a59c53eeafc53b3c69419366276ae52d8be0 Mon Sep 17 00:00:00 2001
From: David Gow <david@ingeniumdigital.com>
Date: Fri, 3 Mar 2023 17:31:21 +0800
Subject: [PATCH] sd_opl2alsa: Don't include x86-specific headers
As part of an old direct IO port access feature which I gave up on long
ago, id_sd_opl2alsa.c included <sys/io.h>.
This header only exists on x86 platforms, so Omnispeak wouldn't build
on, e.g., aarch64 if WITH_ALSA was declared. It's pretty unlikely that
a non-x86 machine has an OPL3 compatible soundcard, but that's no reason
not to support it if it does.
Of course, all of this should go away and be replaced with liboplhw, but
for now, let's fix it.
Thanks to Martin Hauke for creating openSUSE packages, whose failed
aarch64 build uncovered this issue:
https://build.opensuse.org/package/live_build_log/home:mnhauke:games/omnispeak/openSUSE_Tumbleweed/aarch64
---
src/id_sd_opl2alsa.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/id_sd_opl2alsa.c b/src/id_sd_opl2alsa.c
index 433eb49..f94fe20 100644
--- a/src/id_sd_opl2alsa.c
+++ b/src/id_sd_opl2alsa.c
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <sys/io.h>
#include <alsa/asoundlib.h>
#include <sound/asound_fm.h>
--
2.40.0

6
omnispeak.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 23 09:38:19 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch,
unbreak compilation on non-x86.
-------------------------------------------------------------------
Tue Feb 21 20:37:27 UTC 2023 - Martin Hauke <mardnh@gmx.de>

7
omnispeak.spec
View File

@ -1,6 +1,7 @@
#
# spec file for package omnispeak
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2023, Martin Hauke <mardnh@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@ -15,6 +16,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: omnispeak
Version: 1.1+git20230213
Release: 0
@ -27,6 +29,7 @@ Source: %{name}-%{version}.tar.xz
Source1: omnispeak-keen4-wrapper.sh
Source2: omnispeak-keen5-wrapper.sh
Source3: omnispeak-keen6-wrapper.sh
Patch1: 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -56,10 +59,10 @@ Run
* omnispeak-keen4
* omnispeak-keen5
* omnispeak-keen6
from the folder where the original game files are located.
from the directory where the original game files are located.
%prep
%setup -q
%autosetup -p1
%build
%cmake \