Skip to content

ports: update openage and nyan - #18

Merged
ligurio merged 2 commits into
masterfrom
ligurio/gh-xxxx-openage-update
Oct 23, 2026
Merged

ligurio merged 2 commits into
masterfrom
ligurio/gh-xxxx-openage-update

Conversation

@ligurio

@ligurio ligurio commented Oct 23, 2026 •

Copy link
Copy Markdown
Owner

Follows up SFTtech/openage#1825
Follows up SFTtech/nyan#131
Follows up #5

Upstream has no release newer than 0.6.0, but the OpenBSD fixes
were merged to master (PR #1825, merge 8c7d6306), so track that
snapshot. Current master requires C++26 modules and clang >= 21,
which OpenBSD 7.9 does not ship, so stay at the last C++20 commit.

All porting patches are in upstream now and were removed:

- 'codegen' -> 'cppgen' target rename;
- no '-Wl,--no-undefined' for shared libraries on OpenBSD;
- define sig_t as sighandler_t on OpenBSD;
- <util.h>/<termios.h> includes in util/pty.h;
- self_exec_filename() via sysctl(KERN_PROC_ARGS);
- pathfinder no longer initialises entry_sector with NULL.

Upstream still calls find_library(RT_LIB rt) unconditionally on
non-Apple/non-Windows systems, and OpenBSD has no librt; pass
-DRT_LIB= so that CMake does not leave RT_LIB set to
RT_LIB-NOTFOUND.

Dependencies follow upstream 8c7d6306: Python >= 3.12 and Cython
>= 3.1, tomli_w replaces toml, jinja2 is no longer used, and
lz4/mako are now runtime dependencies.  The packing list picks up
the renamed openage/util/toml.py and the new demo_7 shaders.

CI installs py3-tomli_w instead of py3-toml and py3-jinja2.

Follows up SFTtech/openage#1825
The OpenBSD fixes were merged upstream (PR #131), so track the snapshot
that contains them and drop the local patch.

The patch relaxed 'find_package(FLEX 2.6 REQUIRED)' because flex ships
with the OpenBSD base system as 2.5.39, and skipped
'-Wl,--no-undefined' on OpenBSD, where the linker does not pull libc
into the shared library.  Both changes are now in nyan/CMakeLists.txt
upstream.

Stay at ebed788, the last commit before the C++26 module support
(9686f34), which matches the openage 8c7d6306 snapshot and the base
clang 19 in OpenBSD 7.9.

The snapshot adds nyan/concept.h, which is installed, so add it to the
packing list.

Follows up SFTtech/nyan#131
@ligurio
ligurio force-pushed the ligurio/gh-xxxx-openage-update branch from a25143a to 318dd1d Compare October 23, 2026 11:56
@ligurio
ligurio merged commit 239f52e into master Oct 23, 2026
2 checks passed
@ligurio
ligurio deleted the ligurio/gh-xxxx-openage-update branch October 23, 2026 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant