commit: b58178406a6a35025b0cc5e1a51fdf7f432b7c12 Author: Sam Wilson <sam <AT> binarycake <DOT> ca> AuthorDate: Mon Feb 10 14:52:36 2025 +0000 Commit: Sam Wilson <sam <AT> binarycake <DOT> ca> CommitDate: Mon Feb 10 14:54:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5817840
app-misc/wlx-overlay-s: add 9999 Signed-off-by: Sam Wilson <sam <AT> binarycake.ca> .../files/wlx-overlay-s-9999-devendor-openvr.patch | 41 ++++++++ .../files/wlx-overlay-s-9999-x11-pipewire.patch | 13 +++ app-misc/wlx-overlay-s/metadata.xml | 1 + app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild | 104 +++++++++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch b/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch new file mode 100644 index 000000000..aa3203978 --- /dev/null +++ b/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch @@ -0,0 +1,41 @@ +diff --git a/wlx-overlay-s-9999/Cargo.lock b/wlx-overlay-s-9999/Cargo.lock +index 1662153..d7a76af 100644 +--- a/wlx-overlay-s-9999/Cargo.lock ++++ b/wlx-overlay-s-9999/Cargo.lock +@@ -3025,7 +3025,7 @@ dependencies = [ + [[package]] + name = "ovr_overlay" + version = "0.0.0" +-source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"; ++source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"; + dependencies = [ + "byteorder", + "derive_more", +@@ -3040,12 +3040,13 @@ dependencies = [ + [[package]] + name = "ovr_overlay_sys" + version = "0.0.0" +-source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"; ++source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"; + dependencies = [ + "autocxx", + "autocxx-build", + "cxx", + "normpath", ++ "pkg-config", + ] + + [[package]] +diff --git a/wlx-overlay-s-9999/Cargo.toml b/wlx-overlay-s-9999/Cargo.toml +index f1d8e91..73a08ea 100644 +--- a/wlx-overlay-s-9999/Cargo.toml ++++ b/wlx-overlay-s-9999/Cargo.toml +@@ -39,7 +39,7 @@ openxr = { git = "https://github.com/galister/openxrs";, rev = "af4a55d", feature + ovr_overlay = { features = [ + "ovr_input", + "ovr_system", +-], git = "https://github.com/galister/ovr_overlay_oyasumi";, optional = true } ++], git = "https://github.com/galister/ovr_overlay_oyasumi";, rev = "5b5b8bbfdd6d9059f79b2847d8f657e093f2b120", optional = true } + regex = "1.10.4" + rodio = { version = "0.20.1", default-features = false, features = [ + "wav", diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch b/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch new file mode 100644 index 000000000..3e5324761 --- /dev/null +++ b/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch @@ -0,0 +1,13 @@ +diff --git a/src/overlays/screen.rs b/src/overlays/screen.rs +index e4a6c3d..c092b29 100644 +--- a/src/overlays/screen.rs ++++ b/src/overlays/screen.rs +@@ -33,7 +33,7 @@ use { + }; + + #[cfg(all(feature = "x11", feature = "pipewire"))] +-use wlx_capture::pipewire::PipewireStream; ++use {crate::config::AStrMapExt, wlx_capture::pipewire::PipewireStream}; + + #[cfg(feature = "wayland")] + use { diff --git a/app-misc/wlx-overlay-s/metadata.xml b/app-misc/wlx-overlay-s/metadata.xml index 23cdedd3a..db45fa936 100644 --- a/app-misc/wlx-overlay-s/metadata.xml +++ b/app-misc/wlx-overlay-s/metadata.xml @@ -10,6 +10,7 @@ <flag name="openxr">Support Khronos Group's OpenXR API.</flag> <flag name="osc">Support VRChat's Open Sound Control protocol.</flag> <flag name="pipewire">Enable pipewire support for desktop capture.</flag> + <flag name="wayvr">Enable WayVR, a Wayland server for a VR environment.</flag> </use> <upstream> <remote-id type="github">galister/wlx-overlay-s</remote-id> diff --git a/app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild b/app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild new file mode 100644 index 000000000..0627e9df0 --- /dev/null +++ b/app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild @@ -0,0 +1,104 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.13.3 + +EAPI=8 + +LLVM_COMPAT=({15..19}) +RUST_MIN_SLOT="1.83.0" + +inherit cargo git-r3 llvm-r2 desktop + +EGIT_REPO_URI="https://github.com/galister/wlx-overlay-s.git"; + +DESCRIPTION="A lightweight OpenXR/OpenVR overlay for Wayland and X11 desktops" +HOMEPAGE="https://github.com/galister/wlx-overlay-s"; + +REQUIRED_USE=" + || ( openvr openxr ) + || ( wayland X ) + wayland? ( pipewire ) +" + +LICENSE="GPL-3" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 GPL-3 + ISC MIT Unicode-DFS-2016 Unlicense +" +SLOT="0" +IUSE="+openvr +openxr +wayland +X +pipewire +osc +wayvr" +DEPEND=" + media-libs/alsa-lib + media-libs/shaderc + media-libs/fontconfig + sys-apps/dbus + media-libs/freetype + X? ( + x11-libs/libxcb + x11-libs/libxkbcommon[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + openvr? ( + =media-libs/openvr-1.23.8-r0 + ) + openxr? ( + media-libs/openxr-loader[X?,wayland?] + ) + pipewire? ( + media-video/pipewire + ) + wayland? ( + x11-libs/libxkbcommon[wayland] + ) + wayvr? ( + dev-libs/wayland + media-libs/libglvnd + ) + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT}= + ') +" +BDEPEND=" + virtual/pkgconfig +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-x11-pipewire.patch" +) + +pkg_setup() { + export PKG_CONFIG_ALLOW_CROSS=1 + export OPENVR_NO_VENDOR=1 + rust_pkg_setup +} + +src_unpack() { + git-r3_src_unpack + eapply "${FILESDIR}/${P}-devendor-openvr.patch" + cargo_live_src_unpack +} + +src_configure() { + local myfeatures=( + $(usev openvr) + $(usev openxr) + $(usev wayland) + $(usev X x11) + $(usev pipewire) + $(usev osc) + $(usev wayvr) + ) + cargo_src_configure --no-default-features --frozen +} + +src_install() { + doicon --size 256 wlx-overlay-s.png + doicon --size scalable wlx-overlay-s.svg + domenu wlx-overlay-s.desktop + cargo_src_install +}
