media-libs/wivrn: add 26.2, drop old

Signed-off-by: Patrick Nicolas <patricknicolas@laposte.net>
2026-07-09 15:13:31 -04:00 · 2026-02-08 12:13:18 +01:00
parent 86eed68058
commit a418674265
3 changed files with 9 additions and 185 deletions
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,6 +1,4 @@
-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.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
+DIST wivrn-26.2-server-build-deps.tar.xz 24221600 BLAKE2B cd893d0265abfb67caab230e3557ed52d1cf11e3bba4730fa53698cd52b07f1fcbc50cc15fb17b420075902aa22bb6a6145ea6b4af77b16776247d8a566b26eb SHA512 35835251887b3d770561c672d202bcfdeca35c8990ff4943b3a0aede93cf260fef01ad2b724f4b1902d48eed635137f9a05eb0499c84560160ffa4ea038409c1
+DIST wivrn-26.2.tar.gz 3895373 BLAKE2B 534c31996531fa894c8898091a4b1b5273ff03cf9c306a130ef954ddb783f8d14b489018576ba89a874bc6a236af1061dd2f3553e01cb10273fca6bdd19c7077 SHA512 54d8ef7e059ccec0a26c1e0bd4123d9fdf3ec2c5cff95b182cab509307820fcb19efb4d61fe4a79a21d0ec7efe6ecfab793c60ea3cc5f41d82ac9f2fd250c939
--- a/media-libs/wivrn/wivrn-25.9.ebuild
+++ b/media-libs/wivrn/wivrn-25.9.ebuild
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib fcaps flag-o-matic xdg
-
-DESCRIPTION="WiVRn OpenXR streaming"
-HOMEPAGE="https://github.com/WiVRn/WiVRn"
-
-LICENSE="GPL-3 Apache-2.0 MIT"
-SLOT="0"
-IUSE="debug gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins x264"
-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="
-		https://github.com/WiVRn/WiVRn/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/WiVRn/WiVRn/releases/download/v${PV}/server-build-deps.tar.xz -> ${P}-server-build-deps.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib
-	dev-libs/libbsd
-	dev-libs/openssl
-	gnome-base/librsvg
-	media-libs/libpng
-	media-libs/openxr-loader
-	net-dns/avahi
-	x11-libs/libnotify
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	gui? (
-		dev-libs/qcoro[qml]
-		kde-frameworks/kcoreaddons:6
-		kde-frameworks/ki18n:6
-		kde-frameworks/kiconthemes:6
-		kde-frameworks/kirigami:6
-		kde-frameworks/qqc2-desktop-style:6
-	)
-	pipewire? (
-		media-video/pipewire
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	systemd? (
-		sys-apps/systemd
-	)
-	vaapi? ( || (
-		media-video/ffmpeg[libdrm(-),vaapi]
-		media-video/ffmpeg[drm(-),vaapi]
-	) )
-	wireshark-plugins? (
-		net-analyzer/wireshark
-	)
-	x264? (
-		media-libs/x264
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	dev-cpp/cli11
-	dev-cpp/eigen
-	dev-cpp/nlohmann_json
-	dev-util/glslang
-	dev-util/gdbus-codegen
-	dev-util/vulkan-headers
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		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"
-	}
-
-	src_prepare() {
-		default_src_prepare
-		eapply --directory="${WORKDIR}/monado-src" "${WORKDIR}/${P}/patches/monado"/*
-		cmake_src_prepare
-	}
-else
-	src_unpack() {
-		default_src_unpack
-		cd "${WORKDIR}"
-		mv "WiVRn-${PV}" "${P}"
-	}
-fi
-
-multilib_src_configure() {
-	use debug || append-cflags "-DNDEBUG"
-	use debug || append-cxxflags "-DNDEBUG"
-	if [[ ${PV} != 9999 ]]; then
-		GIT_DESC=v${PV}
-		GIT_COMMIT=v${PV}
-	fi
-	local mycmakeargs=(
-		-DGIT_DESC=${GIT_DESC}
-		-DGIT_COMMIT=${GIT_COMMIT}
-		-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_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)
-		-DWIVRN_FEATURE_STEAMVR_LIGHTHOUSE=ON
-		-DWIVRN_USE_PIPEWIRE=$(multilib_native_usex pipewire)
-		-DWIVRN_USE_PULSEAUDIO=$(multilib_native_usex pulseaudio)
-		-DWIVRN_USE_NVENC=$(multilib_native_usex nvenc)
-		-DWIVRN_USE_VAAPI=$(multilib_native_usex vaapi)
-		-DWIVRN_USE_VULKAN_ENCODE=ON
-		-DWIVRN_USE_X264=$(multilib_native_usex x264)
-		-DWIVRN_USE_SYSTEMD=$(multilib_native_usex systemd)
-		-DWIVRN_USE_SYSTEM_OPENXR=ON
-		-DWIVRN_USE_SYSTEM_BOOST=ON
-		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
-		-DENABLE_COLOURED_OUTPUT=OFF
-	)
-
-	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
-	xdg_pkg_postinst
-	elog "WiVRn requires a compatible client on VR headset to run."
-	if [[ ${PV} == 9999 ]]; then
-		elog "For most headsets it can be downloaded from CI artifacts on https://github.com/WiVRn/WiVRn/actions/workflows/Build.yml"
-	else
-		elog "For most headsets it can be downloaded on https://github.com/WiVRn/WiVRn/releases/tag/v${PV}"
-	fi
-}
--- a/media-libs/wivrn/wivrn-25.11.1.ebuild
+++ b/media-libs/wivrn/wivrn-25.11.1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 		sys-auth/elogind
 	)
 	gui? (
+		dev-libs/kirigami-addons
 		dev-libs/qcoro[qml]
 		kde-frameworks/kcoreaddons:6
 		kde-frameworks/ki18n:6
@@ -56,10 +57,9 @@ RDEPEND="
 	systemd? (
 		sys-apps/systemd
 	)
-	vaapi? ( || (
-		media-video/ffmpeg[libdrm(-),vaapi]
+	vaapi? (
 		media-video/ffmpeg[drm(-),vaapi]
-	) )
+	)
 	x264? (
 		media-libs/x264
 	)
@@ -124,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)
@@ -149,15 +150,10 @@ multilib_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
+PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
 	_EOF_
- }
+}

 pkg_postinst()
 {