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

[Patrick Nicolas]

commit:     9881d0e41bbbc49a9a6edd94d75c3e142585fc47
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Fri Dec  6 12:28:05 2024 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Fri Dec  6 12:28:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9881d0e4

media-libs/wivrn: add 0.22, drop 0.20

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

 media-libs/wivrn/Manifest                          |  4 +--
 .../wivrn/{wivrn-0.20.ebuild => wivrn-0.22.ebuild} | 37 +++++++++++++++-------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index 58324b7d6..84363fb7b 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,4 +1,4 @@
-DIST wivrn-0.20-server-build-deps.tar.xz 21140156 BLAKE2B 
17836be45393a0fbd3f45d8654e88ce677a94c7f641f4662c6bcfd47fb70d87394a05544995d79e9203294c0c83d95a221af6b5d73e7cf078e7db9aa7f8f1f67
 SHA512 
a86d9d74afd316a4740b80302dbae63ec13609abd4c33a0b97bdbfbeb6caa36035a5f1b60245c8bec5ab460c7486089efa6eae4b8a0a8121b6d33a4ee9a46417
-DIST wivrn-0.20.tar.gz 11433225 BLAKE2B 
15c00dcd23bf9751d7b119a301298a5487128b6c06b91fd7ed3787b4ac9375d0a822036d76e0e9fe113700524bf0fa27459bfc8173f02eb893233f5fac566d59
 SHA512 
d83be879d31740e2ce382ee9ed095a6299ed6a435a5ef1cffa88aca9af0bb5d242374a90bcf0ff936611454950566da4e3aaa216085259d8301d9122b0159af9
 DIST wivrn-0.21-server-build-deps.tar.xz 21294816 BLAKE2B 
a0b94ab15d39ef73ef384ebb38e29149666a73014b8e0ae9f2b6c53d416190afc8b06948a187381823f502a0673839a9c041d754600367697748c91fc2b6fe82
 SHA512 
33707e1ff92fde0b7bee497a6af0fddc9033afe6e09c0aae5ec7ba6557b3c321edde48db24b8a98e4155aca9c227976375d1591ab8e472a8686c7c57b491142e
 DIST wivrn-0.21.tar.gz 11125575 BLAKE2B 
15b22363751f441cdf84d83d08aa5dbb5a02e77d90862a1aab20b22e3d3e93b0b61d6ad0b9b3a6fb4a2ecf4288360ea51a2884a7ec233eb21681533e87d4cf0f
 SHA512 
8f27624351955053264cc2264f87a7b03e83f11f1c328c9f80e8bbec89d23ffc25948d9a1f579a4ea1ec3e6105f3ed4f918f6593476652ff126ded57e1fdc914
+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

diff --git a/media-libs/wivrn/wivrn-0.20.ebuild 
b/media-libs/wivrn/wivrn-0.22.ebuild
similarity index 86%
rename from media-libs/wivrn/wivrn-0.20.ebuild
rename to media-libs/wivrn/wivrn-0.22.ebuild
index ca8b70ff2..2b3eeb964 100644
--- a/media-libs/wivrn/wivrn-0.20.ebuild
+++ b/media-libs/wivrn/wivrn-0.22.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/WiVRn/WiVRn";
 
 LICENSE="GPL-3 Apache-2.0 MIT"
 SLOT="0"
-IUSE="gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins x264"
+IUSE="gui nvenc +pipewire pulseaudio systemd vaapi vulkan-encode 
wireshark-plugins x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
 if [[ ${PV} == 9999 ]]; then
@@ -25,29 +25,36 @@ else
 fi
 
 RDEPEND="
-       vaapi? (
-               media-video/ffmpeg[libdrm,vaapi]
+       dev-libs/glib
+       dev-libs/libbsd
+       dev-libs/openssl
+       media-libs/openxr-loader
+       net-dns/avahi
+       x11-libs/libnotify
+       || (
+               sys-apps/systemd
+               sys-auth/elogind
        )
-       x264? (
-               media-libs/x264
+       gui? (
+               dev-qt/qtbase:6
        )
-       dev-libs/libbsd
        pipewire? (
                media-video/pipewire
        )
        pulseaudio? (
                media-libs/libpulse
        )
-       media-libs/openxr-loader
-       net-dns/avahi
        systemd? (
                sys-apps/systemd
        )
+       vaapi? (
+               media-video/ffmpeg[libdrm,vaapi]
+       )
        wireshark-plugins? (
                net-analyzer/wireshark
        )
-       gui? (
-               dev-qt/qtbase:6
+       x264? (
+               media-libs/x264
        )
 "
 DEPEND="
@@ -59,6 +66,11 @@ DEPEND="
 "
 BDEPEND="
        dev-util/glslang
+       dev-util/gdbus-codegen
+       gui? (
+               gnome-base/librsvg
+       )
+       dev-util/vulkan-headers
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -67,7 +79,7 @@ if [[ ${PV} == 9999 ]]; then
                default_src_unpack
 
                local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | 
awk '{print $2}')
-               git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMIT}"
+               git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
                git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
        }
 
@@ -94,12 +106,15 @@ src_configure() {
                -DGIT_DESC=${GIT_DESC}
                -DWIVRN_BUILD_CLIENT=OFF
                -DWIVRN_BUILD_SERVER=ON
+               -DWIVRN_OPENXR_MANIFEST_TYPE=relative
                -DWIVRN_BUILD_DASHBOARD=$(usex gui)
                -DWIVRN_BUILD_DISSECTOR=$(usex wireshark-plugins)
+               -DWIVRN_BUILD_WIVRNCTL=ON
                -DWIVRN_USE_PIPEWIRE=$(usex pipewire)
                -DWIVRN_USE_PULSEAUDIO=$(usex pulseaudio)
                -DWIVRN_USE_NVENC=$(usex nvenc)
                -DWIVRN_USE_VAAPI=$(usex vaapi)
+               -DWIVRN_USE_VULKAN_ENCODE=$(usex vulkan-encode)
                -DWIVRN_USE_X264=$(usex x264)
                -DWIVRN_USE_SYSTEMD=$(usex systemd)
                -DWIVRN_USE_SYSTEM_OPENXR=ON