From 150369aae9106f00d176f573f05ae4a466c9db5dbad6484c743271255e8bbca7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Feb 2024 13:30:28 +0000 Subject: [PATCH 1/3] 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 --- ...a-Don-t-include-x86-specific-headers.patch | 38 ------------------- _service | 6 +-- _servicedata | 2 +- omnispeak-1.1+git20230213.tar.xz | 3 -- omnispeak-1.1+git20240123.tar.xz | 3 ++ omnispeak.changes | 7 ++++ omnispeak.spec | 14 +++---- 7 files changed, 21 insertions(+), 52 deletions(-) delete mode 100644 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch delete mode 100644 omnispeak-1.1+git20230213.tar.xz create mode 100644 omnispeak-1.1+git20240123.tar.xz diff --git a/0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch b/0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch deleted file mode 100644 index 17be4a5..0000000 --- a/0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6bd9a59c53eeafc53b3c69419366276ae52d8be0 Mon Sep 17 00:00:00 2001 -From: David Gow -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 . - -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 - #include - #include --#include - - #include - #include --- -2.40.0 - diff --git a/_service b/_service index b59c060..3bda69c 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://github.com/sulix/omnispeak.git git master @@ -7,10 +7,10 @@ @PARENT_TAG@+git%cd v(.*) - + *.tar xz - + diff --git a/_servicedata b/_servicedata index 4539b6f..7d49426 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/sulix/omnispeak.git - 72033b4e56bb596061d069a2db1215cd8eb591f5 \ No newline at end of file + b9e215b9372ab9fe4c86673942c66521c8013cc6 \ No newline at end of file diff --git a/omnispeak-1.1+git20230213.tar.xz b/omnispeak-1.1+git20230213.tar.xz deleted file mode 100644 index 71c01b7..0000000 --- a/omnispeak-1.1+git20230213.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b58310814e4b81f14c87f9596c0b0cac584b910c23f86762da013c3aaab1b5a -size 1250448 diff --git a/omnispeak-1.1+git20240123.tar.xz b/omnispeak-1.1+git20240123.tar.xz new file mode 100644 index 0000000..62c997c --- /dev/null +++ b/omnispeak-1.1+git20240123.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da16a570846a0f411c4773d6cd55749f2de266593a1e2e169dbe66a9e1da4233 +size 1575548 diff --git a/omnispeak.changes b/omnispeak.changes index 4c7ccbd..32024a9 100644 --- a/omnispeak.changes +++ b/omnispeak.changes @@ -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 diff --git a/omnispeak.spec b/omnispeak.spec index b86e63d..575e804 100644 --- a/omnispeak.spec +++ b/omnispeak.spec @@ -1,8 +1,8 @@ # # spec file for package omnispeak # -# Copyright (c) 2023 SUSE LLC -# Copyright (c) 2023, Martin Hauke +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2023-2024, Martin Hauke # # 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 From 978adb8bf17027b617b499b26acc651f930d34b9b1c4658d3dc84656e5c9d2b3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Feb 2024 13:31:33 +0000 Subject: [PATCH 2/3] put back autosetup and terms OBS-URL: https://build.opensuse.org/package/show/games/omnispeak?expand=0&rev=5 --- omnispeak.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnispeak.spec b/omnispeak.spec index 575e804..605ecde 100644 --- a/omnispeak.spec +++ b/omnispeak.spec @@ -59,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 \ From c4a130a01701d685c5f780f3206b312b8612ec2274fa079221ab3fae9d2f0087 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Feb 2024 14:29:26 +0000 Subject: [PATCH 3/3] Store hash in rpmversion, add curated changelog OBS-URL: https://build.opensuse.org/package/show/games/omnispeak?expand=0&rev=6 --- _service | 26 ++++++++++++------------ _servicedata | 4 ---- omnispeak-1.1+git20240123.b9e215b.tar.xz | 3 +++ omnispeak-1.1+git20240123.tar.xz | 3 --- omnispeak.changes | 11 ++++++++-- omnispeak.spec | 2 +- 6 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 _servicedata create mode 100644 omnispeak-1.1+git20240123.b9e215b.tar.xz delete mode 100644 omnispeak-1.1+git20240123.tar.xz diff --git a/_service b/_service index 3bda69c..7b7a64a 100644 --- a/_service +++ b/_service @@ -1,16 +1,16 @@ - - https://github.com/sulix/omnispeak.git - git - master - enable - @PARENT_TAG@+git%cd - v(.*) - - - *.tar - xz - - + + https://github.com/sulix/omnispeak.git + git + master + enable + @PARENT_TAG@+git%cd.%h + v(.*) + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 7d49426..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/sulix/omnispeak.git - b9e215b9372ab9fe4c86673942c66521c8013cc6 \ No newline at end of file diff --git a/omnispeak-1.1+git20240123.b9e215b.tar.xz b/omnispeak-1.1+git20240123.b9e215b.tar.xz new file mode 100644 index 0000000..c7ddbc9 --- /dev/null +++ b/omnispeak-1.1+git20240123.b9e215b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a47718a73308fbc3aac0c0923626ea5a4d34034fea198ebbf7ac41757bd2525e +size 1576564 diff --git a/omnispeak-1.1+git20240123.tar.xz b/omnispeak-1.1+git20240123.tar.xz deleted file mode 100644 index 62c997c..0000000 --- a/omnispeak-1.1+git20240123.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da16a570846a0f411c4773d6cd55749f2de266593a1e2e169dbe66a9e1da4233 -size 1575548 diff --git a/omnispeak.changes b/omnispeak.changes index 32024a9..d04390b 100644 --- a/omnispeak.changes +++ b/omnispeak.changes @@ -1,7 +1,14 @@ ------------------------------------------------------------------- Sat Feb 03 12:26:12 UTC 2024 - mardnh@gmx.de -- Update to version 1.1+git20240123 +- Update to snapshot 1.1+git20240123 (b9e215b) + * Add liboplhw-based driver + * Initial support for OS text events + * Initial support for Game Controller bindings + * Add infrastructure for detecting soundcards + * Allow disabling "pole door glitches" + * Re-restrict platform surfing to Ep 5 + * Add 70Hz ledge grabbing fix. - Drop patch (not longer needed): * 0001-sd_opl2alsa-Don-t-include-x86-specific-headers.patch @@ -14,4 +21,4 @@ Thu Mar 23 09:38:19 UTC 2023 - Jan Engelhardt ------------------------------------------------------------------- Tue Feb 21 20:37:27 UTC 2023 - Martin Hauke -- Initial package, version 1.1+git20230213 +- Initial package, version 1.1+git20230213 (72033b4e5) diff --git a/omnispeak.spec b/omnispeak.spec index 605ecde..d9d28d3 100644 --- a/omnispeak.spec +++ b/omnispeak.spec @@ -18,7 +18,7 @@ Name: omnispeak -Version: 1.1+git20240123 +Version: 1.1+git20240123.b9e215b Release: 0 Summary: An reimplementation of "Commander Keen in Goodbye Galaxy!" License: GPL-2.0-only