mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-09 23:23:00 -04:00
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: 7d076ee0c0
Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
This commit is contained in:
@@ -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')
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user