From dba9d980ba20075b9d721315326021328f90456c Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 14 Jan 2026 00:15:39 +0100 Subject: [PATCH] games-engines/xsystem4: correctly stub out git for version retrieval Previously, we were looking for a patch that doesn't exist (${PV} != ${PVR}), while the existing patch failed to apply. Even if it did, it didn't mitigate meson calling dev-vcs/git. * Add missing issue number for workaround 05ae4e62c9 ("games-engines/xsystem4: workaround cglm memory alignment issue"). Fixes: 7d076ee0c0c62caeece6fa8851f5d3711c40bf94 Signed-off-by: Lucio Sauer --- games-engines/xsystem4/files/version_1.0.0-r1.patch | 9 --------- ...tem4-1.0.0-r1.ebuild => xsystem4-1.0.0-r2.ebuild} | 12 ++++++------ 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 games-engines/xsystem4/files/version_1.0.0-r1.patch rename games-engines/xsystem4/{xsystem4-1.0.0-r1.ebuild => xsystem4-1.0.0-r2.ebuild} (88%) diff --git a/games-engines/xsystem4/files/version_1.0.0-r1.patch b/games-engines/xsystem4/files/version_1.0.0-r1.patch deleted file mode 100644 index 777257b412..0000000000 --- a/games-engines/xsystem4/files/version_1.0.0-r1.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ur a/src/meson.build b/src/meson.build ---- a/src/meson.build 2025-09-29 02:52:05.000000000 +0100 -+++ b/src/meson.build 2025-09-30 14:58:30.420678438 +0100 -@@ -1,5 +1,5 @@ - version_h = vcs_tag(command) : ['git', 'descrive', 'HEAD'], -- fallback : 'unknown version', -+ fallback : '1.0.0', - input : 'version.h.in', - output : 'version.h') diff --git a/games-engines/xsystem4/xsystem4-1.0.0-r1.ebuild b/games-engines/xsystem4/xsystem4-1.0.0-r2.ebuild similarity index 88% rename from games-engines/xsystem4/xsystem4-1.0.0-r1.ebuild rename to games-engines/xsystem4/xsystem4-1.0.0-r2.ebuild index 0647263631..1b2e6be950 100644 --- a/games-engines/xsystem4/xsystem4-1.0.0-r1.ebuild +++ b/games-engines/xsystem4/xsystem4-1.0.0-r2.ebuild @@ -53,11 +53,6 @@ BDEPEND=" virtual/pkgconfig " -# Patch to correct version number for each release, patch must be edited for each new version -PATCHES=( - "${FILESDIR}"/version_"${PV}".patch -) - src_unpack() { default @@ -65,13 +60,18 @@ src_unpack() { mv "${WORKDIR}"/libsys4-${LIBSYS4_COMMIT}/ "${S}"/subprojects/libsys4 || die } +src_prepare() { + sed -i "s/'git', 'describe', 'HEAD'/'echo', '${PV}'/" src/meson.build || die + default +} + src_configure() { local emesonargs=( $(meson_feature debug debugger) $(meson_feature gles2 opengles) # Workaround for unaligned memory access with cglm+AVX - # See: https://github.com/nunuhara/xsystem4/issues/XXX + # See: https://github.com/nunuhara/xsystem4/issues/294 -Dc_args="-DCGLM_ALL_UNALIGNED" )