The package rpms/envision.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/envision.git/commit/?id=50c0afe332bf....
Change: +%ifarch aarch64 x86_64
Thanks.
Full change: ============
commit 7823ccb915d9f78c6c94282f73ed496010dca083 Author: Jonathan Steffan jsteffan@fedoraproject.org Date: Tue Sep 29 13:33:25 2026 -0600
Require monado for default functionality.
diff --git a/envision.spec b/envision.spec index 4f6e3a2..dd04bca 100644 --- a/envision.spec +++ b/envision.spec @@ -88,6 +88,7 @@ BuildRequires: vulkan-headers BuildRequires: vulkan-loader-devel
Requires: hicolor-icon-theme +Requires: monado Requires: patch # Obsolete the dropped wivrn subpackage Obsoletes: envision-wivrn < %{version}-%{release}
commit 50c0afe332bf122d845fb886a580d6de0f83a9f7 Author: Jonathan Steffan jsteffan@fedoraproject.org Date: Sun Sep 20 09:49:44 2026 -0600
Update to git snapshot 733995a6
Drop the wivrn subpackage. Update gtk4, libadwaita, vte4, relm4 and openxr. Sync the monado subpackage requirements with monado.spec.
diff --git a/.gitignore b/.gitignore index d5bab44..cdbf2ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /envision-3.1.0.tar.bz2 /envision-3.1.1.tar.bz2 /envision-3.2.0.tar.bz2 +/envision-733995a6428586d2b3cef3178e3bfb7254df0313.tar.bz2 diff --git a/0001-Bump-git2-dependency-from-0.19-to-0.20.patch b/0001-Bump-git2-dependency-from-0.19-to-0.20.patch deleted file mode 100644 index 03b85c2..0000000 --- a/0001-Bump-git2-dependency-from-0.19-to-0.20.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e7e5b4575b2364bf3a7855b59b7865e759da1ed4 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini decathorpe@gmail.com -Date: Sat, 7 Feb 2026 15:17:09 +0100 -Subject: [PATCH] Bump git2 dependency from 0.19 to 0.20 - ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index ac94097..db00c1f 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ readme = "README.md" - [dependencies] - anyhow = "1.0.86" - gettext-rs = { version = "0.7.0", features = ["gettext-system"] } --git2 = "0.19.0" -+git2 = "0.20.0" - gtk = { package = "gtk4", version = "0.9.0", features = ["v4_10"] } - lazy_static = "1.5.0" - adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] } --- -2.53.0 - diff --git a/0001-fix-drop-RUSTFLAGS-override-from-cargo-clippy-test.patch b/0001-fix-drop-RUSTFLAGS-override-from-cargo-clippy-test.patch deleted file mode 100644 index 687f1f8..0000000 --- a/0001-fix-drop-RUSTFLAGS-override-from-cargo-clippy-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -From de76f72b6dacd6a9338de0236d18af4c12f9b88a Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet kwizart@gmail.com -Date: Thu, 29 Jan 2026 14:19:28 +0100 -Subject: [PATCH] fix: drop RUSTFLAGS override from cargo-clippy test - -This will avoid to trigger a rebuild of the envision application if the -RUSTFLAGS differs from the build. - -fixes #256 ---- - src/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 9d4cce9156de..43f7ffa3edc6 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -53,7 +53,6 @@ test( - test( - 'cargo-clippy', - cargo, -- env: ['RUSTFLAGS=-Dwarnings'], - args: ['clippy', '--all-targets', '--all-features'], - timeout: 0, - ) --- -2.52.0 - diff --git a/0001-fix-import-DeviceLogic-trait-for-libmonado-1.6.patch b/0001-fix-import-DeviceLogic-trait-for-libmonado-1.6.patch deleted file mode 100644 index ffa597a..0000000 --- a/0001-fix-import-DeviceLogic-trait-for-libmonado-1.6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonathan Steffan jsteffan@fedoraproject.org -Date: Sat, 1 Aug 2026 10:53:00 -0600 -Subject: [PATCH] fix: import DeviceLogic trait for libmonado 1.6 - -libmonado 1.6.0 moved Device::serial() and Device::battery_status() -behind the DeviceLogic trait, which must be explicitly imported to be -usable. Without the import, the build fails with: - - error[E0599]: no method named `serial` found for struct - `libmonado::Device<'m>` in the current scope ---- - src/xr_devices.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xr_devices.rs b/src/xr_devices.rs ---- a/src/xr_devices.rs -+++ b/src/xr_devices.rs -@@ -1,4 +1,4 @@ --use libmonado::{self, BatteryStatus, DeviceRole}; -+use libmonado::{self, BatteryStatus, DeviceLogic, DeviceRole}; - use std::{collections::HashMap, fmt::Display, slice::Iter}; - use tracing::error; - --- -2.52.0 - diff --git a/0002-update-openxr-to-0.22-and-use-released-libmonado.patch b/0002-update-openxr-to-0.22-and-use-released-libmonado.patch new file mode 100644 index 0000000..2cef8c5 --- /dev/null +++ b/0002-update-openxr-to-0.22-and-use-released-libmonado.patch @@ -0,0 +1,62 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jonathan Steffan jsteffan@fedoraproject.org +Date: Sun, 20 Sep 2026 09:00:00 -0600 +Subject: [PATCH] Update openxr to 0.22, use released libmonado + +Port the OpenXR prober to the openxr 0.22 API. Use libmonado 1.6.0 from +crates.io instead of a git pin. + +Upstream: https://gitlab.com/gabmus/envision/-/merge_requests/167 +--- + Cargo.toml | 4 ++-- + src/openxr_prober.rs | 5 ++++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 6f13117..b2c8be0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -21,7 +21,7 @@ git2 = "0.20.4" + gtk = { package = "gtk4", version = "0.10.3", features = ["v4_10"] } + lazy_static = "1.5.0" + adw = { package = "libadwaita", version = "0.8.1", features = ["v1_5"] } +-libmonado = { git = "https://github.com/technobaboo/libmonado-rs.git", rev = "8c5481f4061cceb746ee8324da2c7e7ddfb973da", features = ["rc"] } ++libmonado = { version = "1.6.0", features = ["rc"] } + rusb = "0.9.4" + nix = { version = "0.31.2", features = ["fs", "signal"] } + relm4 = { version = "0.10.0", features = ["libadwaita"] } +@@ -34,7 +34,7 @@ tracker = "0.2.2" + uuid = { version = "1.10.0", features = ["v4", "fast-rng"] } + vte4 = { version = "0.9.0", features = ["v0_72"] } + xdg = "3.0.0" +-openxr = { version = "0.21.1", features = ["linked"] } ++openxr = { version = "0.22.0", features = ["linked"] } + ash = "0.38.0" + sha2 = "0.10.8" + tokio = { version = "1.39.3", features = ["process"] } +diff --git a/src/openxr_prober.rs b/src/openxr_prober.rs +index de756e3..1b4ce19 100644 +--- a/src/openxr_prober.rs ++++ b/src/openxr_prober.rs +@@ -5,7 +5,9 @@ use openxr as xr; + use crate::constants::CMD_NAME; + + pub fn is_openxr_ready() -> bool { +- let entry = xr::Entry::linked(); ++ let Ok(entry) = xr::Entry::linked(&()) else { ++ return false; ++ }; + + if entry.enumerate_extensions().is_err() { + return false; +@@ -25,6 +27,7 @@ pub fn is_openxr_ready() -> bool { + }, + &enabled_extensions, + &layers, ++ &(), + ) else { + return false; + }; +-- +2.52.0 + diff --git a/0003-bump-gtk4-libadwaita-vte4-relm4-to-the-0.11-generation.patch b/0003-bump-gtk4-libadwaita-vte4-relm4-to-the-0.11-generation.patch new file mode 100644 index 0000000..4af6166 --- /dev/null +++ b/0003-bump-gtk4-libadwaita-vte4-relm4-to-the-0.11-generation.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jonathan Steffan jsteffan@fedoraproject.org +Date: Sun, 20 Sep 2026 09:00:00 -0600 +Subject: [PATCH] Bump gtk4, libadwaita, vte4 and relm4 to the 0.11/0.9/0.10/0.11 generation + +Fedora only. Upstream cannot take this until delicious-adwaita releases a +version built against gtk4 0.11 and libadwaita 0.9 (Fedora patches +rust-delicious-adwaita itself). +--- + Cargo.toml | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index b2c8be0..8dccb34 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -18,21 +18,21 @@ readme = "README.md" + anyhow = "1.0.86" + gettext-rs = { version = "0.7.0", features = ["gettext-system"] } + git2 = "0.20.4" +-gtk = { package = "gtk4", version = "0.10.3", features = ["v4_10"] } ++gtk = { package = "gtk4", version = "0.11.4", features = ["v4_10"] } + lazy_static = "1.5.0" +-adw = { package = "libadwaita", version = "0.8.1", features = ["v1_5"] } ++adw = { package = "libadwaita", version = "0.9.2", features = ["v1_5"] } + libmonado = { version = "1.6.0", features = ["rc"] } + rusb = "0.9.4" + nix = { version = "0.31.2", features = ["fs", "signal"] } +-relm4 = { version = "0.10.0", features = ["libadwaita"] } +-relm4-components = "0.10.0" ++relm4 = { version = "0.11.0", features = ["libadwaita"] } ++relm4-components = "0.11.0" + reqwest = { version = "0.13.2", features = ["blocking"] } + serde = { version = "1.0.204", features = ["derive"] } + serde_json = "1.0.120" + keyvalues-serde = "0.2.1" + tracker = "0.2.2" + uuid = { version = "1.10.0", features = ["v4", "fast-rng"] } +-vte4 = { version = "0.9.0", features = ["v0_72"] } ++vte4 = { version = "0.10.0", features = ["v0_72"] } + xdg = "3.0.0" + openxr = { version = "0.22.0", features = ["linked"] } + ash = "0.38.0" +-- +2.52.0 + diff --git a/envision-fix-wivrn-apk-download-location.patch b/envision-fix-wivrn-apk-download-location.patch deleted file mode 100644 index 3a2a09d..0000000 --- a/envision-fix-wivrn-apk-download-location.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6bfeec1f3d77f6679d04c00f1ce3c26994a1ab01 Mon Sep 17 00:00:00 2001 -From: Jonathan Steffan jsteffan@fedoraproject.org -Date: Sat, 7 Feb 2026 14:12:07 -0700 -Subject: [PATCH] fix(apk-download): fix download location for WiVRn APKs - ---- - src/ui/install_wivrn_box.rs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ui/install_wivrn_box.rs b/src/ui/install_wivrn_box.rs -index bb7901d..839c703 100644 ---- a/src/ui/install_wivrn_box.rs -+++ b/src/ui/install_wivrn_box.rs -@@ -11,7 +11,7 @@ use std::fs::remove_file; - use tracing::error; - - const WIVRN_LATEST_RELEASE_APK_URL: &str = -- "https://github.com/WiVRn/WiVRn/releases/latest/download/WiVRn-standard-relea..."; -+ "https://github.com/WiVRn/WiVRn/releases/latest/download/WiVRn-release.apk"; - - #[derive(Debug)] - enum GetWivrnApkRefErr { -@@ -200,12 +200,12 @@ impl AsyncComponent for InstallWivrnBox { - } - Ok(WivrnApkRef::Tag(tag)) => { - sender.input(Self::Input::DoInstall( -- format!("https://github.com/WiVRn/WiVRn/releases/download/%7Btag%7D/WiVRn-standard-re...") -+ format!("https://github.com/WiVRn/WiVRn/releases/download/%7Btag%7D/WiVRn-release.apk") - )); - } - Ok(WivrnApkRef::Commit(commit)) => { - sender.input(Self::Input::DoInstall( -- format!("https://github.com/WiVRn/WiVRn-APK/releases/download/apk-%7Bcommit%7D/org.me...") -+ format!("https://github.com/WiVRn/WiVRn-APK/releases/download/apk-%7Bcommit%7D/org.me...") - )); - } - }; --- -GitLab - diff --git a/envision.spec b/envision.spec index 7119706..4f6e3a2 100644 --- a/envision.spec +++ b/envision.spec @@ -1,13 +1,15 @@ %bcond check 1
%global forgeurl https://gitlab.com/gabmus/envision +%global version0 3.2.0 +%global commit 733995a6428586d2b3cef3178e3bfb7254df0313 +%global date 20260822 +%forgemeta
Name: envision -Version: 3.2.0 +Version: %{forgeversion} Release: %autorelease -Summary: UI for building, configuring, and running Monado/WiVRn - -%forgemeta +Summary: UI for building, configuring, and running Monado
# Licenses of statically linked Rust dependencies: # ================================================ @@ -50,14 +52,10 @@ License: %{shrink:
URL: %{forgeurl} Source0: %{forgesource} -# Reported upstream https://gitlab.com/gabmus/envision/-/issues/256 -Patch0: 0001-fix-drop-RUSTFLAGS-override-from-cargo-clippy-test.patch -# https://gitlab.com/gabmus/envision/-/merge_requests/144 -Patch1: 0001-Bump-git2-dependency-from-0.19-to-0.20.patch -# https://gitlab.com/gabmus/envision/-/merge_requests/145 -Patch2: envision-fix-wivrn-apk-download-location.patch -# Fix FTBFS with libmonado 1.6: DeviceLogic trait must be imported -Patch3: 0001-fix-import-DeviceLogic-trait-for-libmonado-1.6.patch +# https://gitlab.com/gabmus/envision/-/merge_requests/167 +Patch2: 0002-update-openxr-to-0.22-and-use-released-libmonado.patch +# Fedora only: needs a gtk4 0.11 build of delicious-adwaita upstream +Patch3: 0003-bump-gtk4-libadwaita-vte4-relm4-to-the-0.11-generation.patch
BuildRequires: cargo BuildRequires: cargo-rpm-macros >= 26 @@ -91,11 +89,12 @@ BuildRequires: vulkan-loader-devel
Requires: hicolor-icon-theme Requires: patch -Suggests: android-tools +# Obsolete the dropped wivrn subpackage +Obsoletes: envision-wivrn < %{version}-%{release}
%description -UI for building, configuring, and running Monado, the open source +UI for building, configuring, and running Monado, the open source OpenXR runtime.
This is still highly experimental software, while it's unlikely that @@ -108,94 +107,16 @@ to encounter unexpected behavior that while in VR might cause motion sickness or physical injury. Be very careful while in VR using this app!
-%package wivrn - -Summary: WiVRn Build Dependencies for Envision -Requires: %{name} = %{version}-%{release} -# Sync with https://src.fedoraproject.org/rpms/wivrn/raw/rawhide/f/wivrn.spec -Requires: boost-devel -Requires: cmake -Requires: desktop-file-utils -Requires: extra-cmake-modules -Requires: gcc-c++ -Requires: gettext-devel -Requires: git -Requires: glslc -Requires: kf6-kcoreaddons-devel -Requires: kf6-ki18n-devel -Requires: kf6-kiconthemes-devel -Requires: kf6-kirigami-devel -Requires: libappstream-glib -Requires: librsvg2-tools -Requires: ninja-build -Requires: openxr-devel -Requires: python -Requires: pkgconfig(avahi-client) -Requires: pkgconfig(avahi-glib) -Requires: pkgconfig(bluez) -Requires: pkgconfig(CLI11) -Requires: pkgconfig(dbus-1) -Requires: pkgconfig(eigen3) -Requires: pkgconfig(glslang) -Requires: pkgconfig(gstreamer-1.0) -Requires: pkgconfig(gstreamer-app-1.0) -Requires: pkgconfig(gstreamer-video-1.0) -Requires: pkgconfig(hidapi-libusb) -Requires: pkgconfig(libarchive) -Requires: pkgconfig(libavcodec) -Requires: pkgconfig(libavfilter) -Requires: pkgconfig(libavutil) -Requires: pkgconfig(libbsd) -Requires: pkgconfig(libcap) -Requires: pkgconfig(libcjson) -Requires: pkgconfig(libdrm) -Requires: pkgconfig(libjpeg) -Requires: pkgconfig(libnotify) -Requires: pkgconfig(libpipewire-0.3) -Requires: pkgconfig(libudev) -Requires: pkgconfig(libusb-1.0) -Requires: pkgconfig(libuvc) -Requires: pkgconfig(librsvg-2.0) -Requires: pkgconfig(libswscale) -Requires: pkgconfig(libva) -Requires: pkgconfig(nlohmann_json) -Requires: pkgconfig(opencv) -Requires: pkgconfig(openhmd) -Requires: pkgconfig(openssl) -Requires: pkgconfig(openvr) -Requires: pkgconfig(Qt6) -Requires: pkgconfig(Qt6Linguist) -Requires: pkgconfig(Qt6Quick) -Requires: pkgconfig(realsense2) -Requires: pkgconfig(sdl2) -Requires: pkgconfig(vulkan) -Requires: pkgconfig(wayland-client) -Requires: pkgconfig(wayland-eglstream) -Requires: pkgconfig(wayland-protocols) -Requires: pkgconfig(wayland-scanner) -Requires: pkgconfig(xrandr) -Requires: qcoro-qt6-devel -Requires: qt6-qtbase-private-devel -Requires: qt6-qtdeclarative-devel -Requires: qt6qml(org.kde.desktop) -Requires: android-tools -Requires: firewalld-filesystem -Requires: hicolor-icon-theme - -%description wivrn -Build dependencies for WiVRn. Install this to automatically -bring in all needed dependencies for building WiVRn. - - %package monado
Summary: Monado Build Dependencies for Envision Requires: %{name} = %{version}-%{release} -# Sync with https://jsteffan.fedorapeople.org/imrsv/monado.spec +# Sync with https://src.fedoraproject.org/rpms/monado/blob/rawhide/f/monado.spec Requires: cmake Requires: gcc-c++ Requires: glslc Requires: ninja-build +Requires: pkgconfig(basalt) Requires: pkgconfig(bluez) Requires: pkgconfig(dbus-1) Requires: pkgconfig(dri) @@ -210,8 +131,8 @@ Requires: pkgconfig(libbsd) Requires: pkgconfig(libcjson) Requires: pkgconfig(libdrm) Requires: pkgconfig(libjpeg) -# ONNX only for x86_64, ppc64le and aarch64 -%ifnarch s390x %{arm} %{ix86} +# ONNX only for aarch64 and x86_64 (handtracking) +%ifarch aarch64 x86_64 Requires: pkgconfig(libonnxruntime) %endif Requires: pkgconfig(libudev) @@ -221,8 +142,13 @@ Requires: pkgconfig(opencv) Requires: pkgconfig(openhmd) Requires: pkgconfig(openvr) Requires: pkgconfig(openxr) +# percetto only for aarch64 and x86_64 (perfetto tracing) +%ifarch aarch64 x86_64 +Requires: pkgconfig(percetto) +%endif Requires: pkgconfig(realsense2) Requires: pkgconfig(sdl2) +Requires: pkgconfig(survive) Requires: pkgconfig(vulkan) Requires: pkgconfig(wayland-client) Requires: pkgconfig(wayland-eglstream) @@ -290,8 +216,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %{_datarootdir}/icons/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg %{_metainfodir}/org.gabmus.envision.appdata.xml
-%files wivrn - %files monado
%files xrizer diff --git a/sources b/sources index d66ebfe..9b29991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (envision-3.2.0.tar.bz2) = 52e9dfd55aa952478783c4083a801d0022b969cd3ca559de64793347777da0f9f32dc447eea5e91e1ad149a619428e2b9e6a34ba665d6e1410cc6909e865f2f7 +SHA512 (envision-733995a6428586d2b3cef3178e3bfb7254df0313.tar.bz2) = 7904d26abd0958ff2dde97736801b6188d6cd09cd56fed1024bb461d50ba0f6615a69f81d791e6b9ec96cfdf4ee6097cfd01dcc045f41b9d0ec490bc1ede7965
arch-excludes@lists.fedoraproject.org