forked from pool/omnispeak
Accepting request 1143800 from home:mnhauke:games
- Update to version 1.1+git20240123 - Drop patch (not longer needed): * 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch OBS-URL: https://build.opensuse.org/request/show/1143800 OBS-URL: https://build.opensuse.org/package/show/games/omnispeak?expand=0&rev=4
This commit is contained in:
Git OBS Bridge
parent
be6f824c95
commit
150369aae9
@ -1,38 +0,0 @@
|
||||
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
_service
6
_service
@ -1,5 +1,5 @@
|
||||
<services>
|
||||
<service mode="disabled" name="tar_scm">
|
||||
<service mode="manual" name="tar_scm">
|
||||
<param name="url">https://github.com/sulix/omnispeak.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">master</param>
|
||||
@ -7,10 +7,10 @@
|
||||
<param name="versionformat">@PARENT_TAG@+git%cd</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
</service>
|
||||
<service mode="disabled" name="recompress">
|
||||
<service mode="manual" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version"/>
|
||||
<service mode="manual" name="set_version"/>
|
||||
</services>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/sulix/omnispeak.git</param>
|
||||
<param name="changesrevision">72033b4e56bb596061d069a2db1215cd8eb591f5</param></service></servicedata>
|
||||
<param name="changesrevision">b9e215b9372ab9fe4c86673942c66521c8013cc6</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b58310814e4b81f14c87f9596c0b0cac584b910c23f86762da013c3aaab1b5a
|
||||
size 1250448
|
||||
3
omnispeak-1.1+git20240123.tar.xz
Normal file
3
omnispeak-1.1+git20240123.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da16a570846a0f411c4773d6cd55749f2de266593a1e2e169dbe66a9e1da4233
|
||||
size 1575548
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 03 12:26:12 UTC 2024 - mardnh@gmx.de
|
||||
|
||||
- Update to version 1.1+git20240123
|
||||
- Drop patch (not longer needed):
|
||||
* 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 23 09:38:19 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#
|
||||
# spec file for package omnispeak
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2023, Martin Hauke <mardnh@gmx.de>
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2023-2024, Martin Hauke <mardnh@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: omnispeak
|
||||
Version: 1.1+git20230213
|
||||
Version: 1.1+git20240123
|
||||
Release: 0
|
||||
Summary: An reimplementation of "Commander Keen in Goodbye Galaxy!"
|
||||
License: GPL-2.0-only
|
||||
@ -29,11 +29,11 @@ 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++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: libieee1284-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
@ -59,10 +59,10 @@ Run
|
||||
* omnispeak-keen4
|
||||
* omnispeak-keen5
|
||||
* omnispeak-keen6
|
||||
from the directory where the original game files are located.
|
||||
from the folder where the original game files are located.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
@ -70,7 +70,7 @@ from the directory where the original game files are located.
|
||||
-DXDGUSERPATH=OFF \
|
||||
-DOMNIPATH=%{_datadir}/omnispeak \
|
||||
-DWITH_ALSA=ON \
|
||||
-DWITH_IEEE1284=OFF
|
||||
-DWITH_IEEE1284=ON
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user