commit: 36f7b26dc1a6006deb234c25f876d9446388612a
Author: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Fri Dec 19 18:41:21 2025 +0000
Commit: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Fri Dec 19 18:43:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36f7b26d
media-libs/wivrn: add 25.12, drop 25.8
Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>
media-libs/wivrn/Manifest | 4 +--
.../{wivrn-25.8.ebuild => wivrn-25.12.ebuild} | 42 ++++++++++------------
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index 5e26b0f7f7..2eaae5966b 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,6 +1,6 @@
DIST wivrn-25.11.1-server-build-deps.tar.xz 22951188 BLAKE2B
300a709d7062f7a6a5611dd45a86c100247ee57fa1c066b25bf3bd181411e6709696a5666fc7e3b4a60421b64f17bc8e7106bf96e1995e3140639e546f3e7962
SHA512
9d82c1ed9efc2af1910bdf1e30be38a8698c50d1b24228589d44cab74738c6a31bf5da03b18245ded23c5ecd7962e1fdc306e259845c8b4e4cc3749cf0c6d853
DIST wivrn-25.11.1.tar.gz 12579749 BLAKE2B
a40449e4ced67a2fe5fd8ac981ed1f1d50c6c4200c3ac8567d2920c4bbc9227482ca241635710ab82c3b2d1610ec4b6cd1c50e9952e9a304df812ad3cf49befe
SHA512
a420de03efc9bb07b0ba43442fc6461b1b4e98f407e3c67d5d6fc59e423b2760c194fd1ac3d7417371d6dc8add4b31233745302bc296abefd1ebb4f3dfee1291
-DIST wivrn-25.8-server-build-deps.tar.xz 22876608 BLAKE2B
e54f1da83bd9cc1a470893748663c63523ec283b4f3c69eec5aaf7dbe382118923198a70e6caa4abddc4ffbe4c538347c9483e3af154031950273f1d00920f3d
SHA512
a702ec6850c392fa6353522ff27edb12fcb9017424cbf9560a64e47f9b1dd22878b4f4ffb96eb14a1b0a8de4f24801caf94aaaf592f1b095d63269db8ad8b2d0
-DIST wivrn-25.8.tar.gz 11441756 BLAKE2B
1cb44f774afc744e279e23561c4b4deddaaf18e63e1c119703f9a1eb1a9b63cb36225bbbe3b73f6bc2ac4c21cf0c03928da81ea7e6b6b3217958549ca920d8f5
SHA512
be6f260e2ccbcc276f4656a2d3a7797384d4cd293a4bd9bb9aa035eaf2e059fd2c4d9d896f9841b904cf3cf3a27ea36b8a01c7f400a20fd0a0332db0c51c53e9
+DIST wivrn-25.12-server-build-deps.tar.xz 23463764 BLAKE2B
8d4a453bad03d7a03c2dcf210f432b2f6705f8714ecd6d589a875da3b679c69409081a13aa95ac5483fe6f355c359282859e6a8e5ce4b41964ed7c41b47cdda2
SHA512
57ce200f4f8d95d6d5877d595326e57cfaf3482ad201229d316a2844809adcd5b16cec5eed30d98391d3a70a96bf1c20f19d0fef9c4adafa9bbe2992032c3baf
+DIST wivrn-25.12.tar.gz 3866446 BLAKE2B
56f576efca1734d4ef492c939eea6baacfb6645a65bb9fdf4d9bab253aaf5f162b0a2da4349acef5b3c853bfba70dcf95778bf4cf82976c9c92bfb513a3f1b7a
SHA512
2fd4cc97fc639a72a929d3f91037563d3c3e83ae789b31bccb869a25d13f701dccf56915a32f78991159e5944e028f27ba1931b6b9a540c4bb4e55fceb2c327d
DIST wivrn-25.9-server-build-deps.tar.xz 22610092 BLAKE2B
7ae693051d1f64cec25357aedb77e9501af071d47e06774f80aee7b55b3c834f379ddbd4a9fdc5a8795b9a84ac0bc1708e14e8f65f4f54485e0b02a6ceb3641f
SHA512
d044cd604c5d21955baff45e8dd86293721d36c53eb6d94a05a2c68e65ac7e17b862153694d504f708cb80d42d226d3146aa2a56f376b8a7b1dba42f0be99fcb
DIST wivrn-25.9.tar.gz 11444064 BLAKE2B
a7d816eb12c8f2da8932c5e06b8c53b741386a7c2ccaad11608dff10fc9c1b280f6970c172bf26b9a5cc61fb967f7257d98679acef5948d4116e60677879d39c
SHA512
67db629b44cc001e25650ffe9a5cd2045d96f92471219f3dd44a9efe280c9c13a38a5d065f1f3a9e3895186d364cd3cd6e94728352a9d0beb5a01e26e355bedb
diff --git a/media-libs/wivrn/wivrn-25.8.ebuild
b/media-libs/wivrn/wivrn-25.12.ebuild
similarity index 89%
rename from media-libs/wivrn/wivrn-25.8.ebuild
rename to media-libs/wivrn/wivrn-25.12.ebuild
index 7f2e0c9712..cfb439ffbe 100644
--- a/media-libs/wivrn/wivrn-25.8.ebuild
+++ b/media-libs/wivrn/wivrn-25.12.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="
@@ -59,24 +60,26 @@ RDEPEND="
media-video/ffmpeg[libdrm(-),vaapi]
media-video/ffmpeg[drm(-),vaapi]
) )
- wireshark-plugins? (
- net-analyzer/wireshark
- )
x264? (
media-libs/x264
)
+ wireshark-plugins? (
+ !=net-analyzer/wireshark-4.6.0
+ net-analyzer/wireshark
+ )
"
DEPEND="
${RDEPEND}
+
dev-libs/boost
-"
-BDEPEND="
dev-cpp/cli11
dev-cpp/eigen
dev-cpp/nlohmann_json
+ dev-util/vulkan-headers
+"
+BDEPEND="
dev-util/glslang
dev-util/gdbus-codegen
- dev-util/vulkan-headers
"
if [[ ${PV} == 9999 ]]; then
@@ -84,6 +87,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 +114,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
@@ -118,7 +124,8 @@ multilib_src_configure() {
-DWIVRN_BUILD_CLIENT=OFF
-DWIVRN_BUILD_SERVER=$(multilib_is_native_abi && echo ON ||
echo OFF)
-DWIVRN_BUILD_SERVER_LIBRARY=ON
- -DWIVRN_OPENXR_MANIFEST_TYPE=filename
+ -DWIVRN_OPENXR_MANIFEST_TYPE=relative
+ -DWIVRN_OPENXR_MANIFEST_ABI=$(multilib_is_native_abi && echo
OFF || echo ON)
-DWIVRN_BUILD_DASHBOARD=$(multilib_native_usex gui)
-DWIVRN_BUILD_DISSECTOR=$(multilib_native_usex
wireshark-plugins)
-DWIVRN_BUILD_WIVRNCTL=$(multilib_is_native_abi && echo ON ||
echo OFF)
@@ -140,19 +147,6 @@ multilib_src_configure() {
cmake_src_configure
}
-multilib_src_install() {
- cmake_src_install
-
- local i ldpath=""
- for i in $(get_all_libdirs) ; do
- ldpath="${ldpath}:/usr/${i}/wivrn"
- done
- newenvd - "50${PN}" <<-_EOF_
- LDPATH="${ldpath}"
- PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
- _EOF_
- }
-
pkg_postinst()
{
fcaps cap_sys_nice usr/bin/wivrn-server
