On Thu, 19 Mar 2026 22:20:59 -0700
Thomas Frohwein <tfrohwein@fastmail.com> wrote:
> Hi,
>
> I'm ready to pick this one up from the unmaintained game ports. This
> updates to latest release (20260301). Also simplified the patch for
> evading the git version tag detection logic. Runs fine on limited
> testing. (Tip: Alt+Enter gets you fullscreen instead of the tiny VGA
> window.)
>
> ok?
>
*ping*
(same diff again below)
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openjazz/Makefile,v
diff -u -p -r1.6 Makefile
--- Makefile 11 Feb 2026 15:12:25 -0000 1.6
+++ Makefile 20 Mar 2026 05:16:59 -0000
@@ -3,10 +3,10 @@ CATEGORIES = games x11
GH_ACCOUNT = AlisterT
GH_PROJECT = openjazz
-GH_TAGNAME = 20231028
-REVISION = 0
+GH_TAGNAME = 20260301
HOMEPAGE = http://www.alister.eu/jazz/oj/
+MAINTAINER = Thomas Frohwein <thfr@openbsd.org>
# GPLv2+
PERMIT_PACKAGE = Yes
@@ -24,5 +24,7 @@ LIB_DEPENDS = devel/sdl2
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
+
+CONFIGURE_ARGS += -DGIT_TAG=${GH_TAGNAME}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openjazz/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 5 Jul 2024 19:01:09 -0000 1.2
+++ distinfo 20 Mar 2026 05:16:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (openjazz-20231028.tar.gz) = xF/0FNyEZWOteuS2yEj5OKtpXrSub5WIVrP6QJ2guKw=
-SIZE (openjazz-20231028.tar.gz) = 417317
+SHA256 (openjazz-20260301.tar.gz) = nBF6jZqlOcTcs/tXiBMFY6g8odmBnlOPIzch2CP3plA=
+SIZE (openjazz-20260301.tar.gz) = 569778
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/openjazz/patches/patch-CMakeLists_txt,v
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 5 Jul 2024 19:01:09 -0000 1.1
+++ patches/patch-CMakeLists_txt 20 Mar 2026 05:16:59 -0000
@@ -3,40 +3,14 @@ Don't do git.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -202,36 +202,6 @@ endif()
+@@ -241,8 +241,8 @@ endif()
# version
string(TIMESTAMP OJ_DATE "%Y-%m-%d")
-include(GetGitRevisionDescription)
-git_get_exact_tag(GIT_TAG)
--# Do not include a hash, if we are building a release tag
--if(NOT GIT_TAG)
-- # otherwise concatenate a version with hash
-- git_describe(GIT_DESCRIPTION)
-- if(GIT_DESCRIPTION)
-- string(REPLACE "-" ";" GIT_DESCRIPTION ${GIT_DESCRIPTION})
-- list(LENGTH GIT_DESCRIPTION GIT_DESCRIPTION_PARTS)
-- if(GIT_DESCRIPTION_PARTS EQUAL 3)
-- list(GET GIT_DESCRIPTION 0 GIT_TAG)
-- list(GET GIT_DESCRIPTION 1 GIT_COMMITS)
-- list(GET GIT_DESCRIPTION 2 GIT_HASH)
-- set(GIT_STATUS "${GIT_COMMITS} commits since tag \"${GIT_TAG}\", ")
-- string(PREPEND GIT_COMMITS "+")
-- else()
-- # no tags found, only hash
-- list(GET GIT_DESCRIPTION 0 GIT_HASH)
-- endif()
-- # strip the g prefix
-- string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
-- set(OJ_VERSION_GIT "git${GIT_COMMITS}@${GIT_HASH}")
-- string(APPEND GIT_STATUS "object hash is ${GIT_HASH}")
-- git_local_changes(GIT_DIRTY)
-- if(GIT_DIRTY STREQUAL "DIRTY")
-- string(APPEND OJ_VERSION_GIT "-dirty")
-- string(APPEND GIT_STATUS ", with uncommitted changes")
-- endif()
-- endif()
--endif()
- set_property(SOURCE src/version.cpp PROPERTY COMPILE_DEFINITIONS
- OJ_VERSION="${PROJECT_VERSION}"; OJ_DATE="${OJ_DATE}";
- $<$<BOOL:${OJ_VERSION_GIT}>:OJ_VERSION_GIT="${OJ_VERSION_GIT}">)
++#include(GetGitRevisionDescription)
++#git_get_exact_tag(GIT_TAG)
+ # Do not include a hash, if we are building a release tag
+ if(NOT GIT_TAG)
+ # otherwise concatenate a version with hash
Index: patches/patch-ext_psmplug_stdafx_h
===================================================================
RCS file: patches/patch-ext_psmplug_stdafx_h
diff -N patches/patch-ext_psmplug_stdafx_h
--- patches/patch-ext_psmplug_stdafx_h 11 Mar 2022 19:04:45 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: ext/psmplug/stdafx.h
---- ext/psmplug/stdafx.h.orig
-+++ ext/psmplug/stdafx.h
-@@ -46,7 +46,6 @@ inline void ProcessPlugins(int n) {}
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-
- typedef int8_t CHAR;
- typedef uint8_t UCHAR;
Index: patches/patch-src_io_network_cpp
===================================================================
RCS file: /cvs/ports/games/openjazz/patches/patch-src_io_network_cpp,v
diff -u -p -r1.3 patch-src_io_network_cpp
--- patches/patch-src_io_network_cpp 5 Jul 2024 19:01:09 -0000 1.3
+++ patches/patch-src_io_network_cpp 20 Mar 2026 05:16:59 -0000
@@ -3,7 +3,7 @@ Missing netinet/in.h and sys/select.h
Index: src/io/network.cpp
--- src/io/network.cpp.orig
+++ src/io/network.cpp
-@@ -43,6 +43,8 @@
+@@ -45,6 +45,8 @@
#define EWOULDBLOCK WSAEWOULDBLOCK
No comments:
Post a Comment