[gentoo-commits] repo/proj/guru:dev commit in: media-libs/wivrn/

[Patrick Nicolas]

commit:     b9093ed5ddb813665569be119129cfc26f4c3d5a
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Fri Apr  4 19:21:26 2025 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Fri Apr  4 19:21:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9093ed5

media-libs/wivrn: add 0.24, drop 0.22-r1

Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>

 media-libs/wivrn/Manifest                          |  4 ++--
 .../{wivrn-0.22-r1.ebuild => wivrn-0.24.ebuild}    | 28 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index 938a8898c..2a873a89f 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,4 +1,4 @@
-DIST wivrn-0.22-server-build-deps.tar.xz 21634036 BLAKE2B 
1b6ddb85617f02c683d3da1908e4afa92ca620ebace42c6030ece9cabde1311d4262bcd02a66166bf19a247b149f9bdeec3cfa21abbbb0a5cbadb0c97f0e0317
 SHA512 
98b99adb3b00fca1a1650f0cd082cb363da66c3245976a51ede6fa7117f52c1fec3269644d6917111897e3e2c972a6b9ea12c78882fed49bafec9ad83e6e512f
-DIST wivrn-0.22.tar.gz 11159586 BLAKE2B 
e83b3d95ad92c752e39d5233c2636f5cf095183880fa12a08589afa1e645a5ea7b41cdb985c5f43107c03c0c1aa3b13718cc4f9ddf7da9f4f7d1159a9057bfe0
 SHA512 
24fc6f36e4c9345a9f3fc3e6c2c47fbee5cdbc2f9864e58e5750209f58e32c40e08d48d091d7b2d5a2d161c4017642e3747799d8efc3e7bc5d6d040191022536
 DIST wivrn-0.23.2-server-build-deps.tar.xz 21758304 BLAKE2B 
e95559305dc161823946df57b40c401a263524f23c4f638e0d7154b0c2f0450d8ba5db7e7296c6cc8a02ffec9d54afbc4e5946cdff11de4219c772ec5b5a47c6
 SHA512 
b9a25c94ed058e74e3339e08d29d8f0a728fb15ce64bfa1b27ab98a476bf16632f9cf22fe84bead2423a64d6d8a5a5942e3027fc16ac592087e4be0137d83871
 DIST wivrn-0.23.2.tar.gz 11184314 BLAKE2B 
c3890a115e502b70ed62f1f2694b4b9494d83a6670948198e475d82c26d447c9c88758cf69e6e90da903f7e0f838d3c4814204901d0266d526b1334df719fcb6
 SHA512 
9d69c1f4de09ea718b2ba038d030af3941a6d1ff14d6ca3d6476399b0b03e8e459ecd3340ed54c06f5e1be070a63586d3437c3332be832f67958af9cb7f99838
+DIST wivrn-0.24-server-build-deps.tar.xz 22027232 BLAKE2B 
a35908cb0186c54f6a1cd2c45aa73667ae63110bb1f35b28de05ac555fc58c124bec324f88fae26037a2c7375af0a68db537e3e689ba23a80e9632fd8df1e3c9
 SHA512 
d0633c4524be7e799a34242a2abbb65504c2891e9302c003ec72c19b158c664b5892b34a62d9082949ff712dea910642ed7f0b512eefeb2d1a22a840726228e6
+DIST wivrn-0.24.tar.gz 11226705 BLAKE2B 
2080bd570480b4d13216243e1e38b1d58c2c15712db4cd5c21bb36873fc91b4d0aacb916576fe0972914ba725258b321f8730b7e1050c61fc9da079919fa2dae
 SHA512 
2936cf1487ca6104d74c536262049365758b8701365fc9ac3c91a2bf234755312f939930e8ca059bae66c01c88869e75aeccf0ce48cc31f9d644c4d0f240c47d

diff --git a/media-libs/wivrn/wivrn-0.22-r1.ebuild 
b/media-libs/wivrn/wivrn-0.24.ebuild
similarity index 85%
rename from media-libs/wivrn/wivrn-0.22-r1.ebuild
rename to media-libs/wivrn/wivrn-0.24.ebuild
index bdf6ad77a..0c6ec80b0 100644
--- a/media-libs/wivrn/wivrn-0.22-r1.ebuild
+++ b/media-libs/wivrn/wivrn-0.24.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=8
 
-inherit cmake fcaps xdg
+inherit cmake 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="gui nvenc +pipewire pulseaudio systemd vaapi vulkan-encode 
wireshark-plugins x264"
+IUSE="debug gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins 
x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
-PATCHES=( "${FILESDIR}/${P}-vulkan-304.patch" )
-
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git";
@@ -38,7 +36,12 @@ RDEPEND="
                sys-auth/elogind
        )
        gui? (
-               dev-qt/qtbase:6
+               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
@@ -81,7 +84,7 @@ if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack
                default_src_unpack
 
-               local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | 
awk '{print $2}')
+               local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | 
awk '{print $2}' | tail -1)
                git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
                git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
        }
@@ -100,13 +103,18 @@ else
 fi
 
 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
                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=ON
                -DWIVRN_OPENXR_MANIFEST_TYPE=relative
@@ -117,7 +125,7 @@ src_configure() {
                -DWIVRN_USE_PULSEAUDIO=$(usex pulseaudio)
                -DWIVRN_USE_NVENC=$(usex nvenc)
                -DWIVRN_USE_VAAPI=$(usex vaapi)
-               -DWIVRN_USE_VULKAN_ENCODE=$(usex vulkan-encode)
+               -DWIVRN_USE_VULKAN_ENCODE=ON
                -DWIVRN_USE_X264=$(usex x264)
                -DWIVRN_USE_SYSTEMD=$(usex systemd)
                -DWIVRN_USE_SYSTEM_OPENXR=ON
@@ -130,12 +138,6 @@ src_configure() {
        cmake_src_configure
 }
 
-src_install() {
-       cmake_src_install
-
-       dosym -r /usr/share/openxr/1/openxr_wivrn.json 
/etc/openxr/1/active_runtime.json
-}
-
 pkg_postinst()
 {
        fcaps cap_sys_nice usr/bin/wivrn-server