commit: 154168de1462786af53ec1ed1dacdbc35665b5e5
Author: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Mon Aug 11 13:34:12 2025 +0000
Commit: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Mon Aug 11 13:34:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=154168de
media-libs/wivrn: Fix version display in live ebuild
Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>
media-libs/wivrn/wivrn-9999.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/media-libs/wivrn/wivrn-9999.ebuild
b/media-libs/wivrn/wivrn-9999.ebuild
index 7f2e0c9712..8b7bc3721b 100644
--- a/media-libs/wivrn/wivrn-9999.ebuild
+++ b/media-libs/wivrn/wivrn-9999.ebuild
@@ -16,6 +16,7 @@ REQUIRED_USE="|| ( nvenc vaapi x264 )"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git";
+ EGIT_MIN_CLONE_TYPE="single+tags"
MONADO_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git";
else
SRC_URI="
@@ -84,6 +85,12 @@ if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
default_src_unpack
+ # export those before Monado is checked out
+ export GIT_DESC=$(git -C "${EGIT_DIR}" describe
"${EGIT_VERSION}" --tags --always)
+ export GIT_COMMIT=${EGIT_VERSION}
+
+ # Only use those for the main repo
+ unset EGIT_BRANCH EGIT_COMMIT
local MONADO_COMMIT=$(cat "${P}/monado-rev")
git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
@@ -105,10 +112,7 @@ fi
multilib_src_configure() {
use debug || append-cflags "-DNDEBUG"
use debug || append-cxxflags "-DNDEBUG"
- if [[ ${PV} == 9999 ]]; then
- GIT_DESC=$(git describe --tags --always)
- GIT_COMMIT=$(git rev-parse HEAD)
- else
+ if [[ ${PV} != 9999 ]]; then
GIT_DESC=v${PV}
GIT_COMMIT=v${PV}
fi
