update to upstream pipewire-rs (#508)

galister · web-flow · commit 10b14794ed90 · 2026-05-03T14:36:49.000+09:00
* update to upstream pipewire-rs

* CI to use 24.04 without no pipewire ppa

* fix build without openxr feature
diff --git a/.github/workflows/build-all-features.yml b/.github/workflows/build-all-features.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
@@ -15,7 +15,7 @@ env:
   
 jobs:
   build_appimage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-default.yml b/.github/workflows/build-default.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openvr.yml b/.github/workflows/build-wayland-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openxr.yml b/.github/workflows/build-wayland-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openvr.yml b/.github/workflows/build-x11-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openxr.yml b/.github/workflows/build-x11-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -13,7 +13,7 @@ env:
   
 jobs:
   make_release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/scripts/appimage_prepare_env.sh b/.github/workflows/scripts/appimage_prepare_env.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-sudo add-apt-repository -syn universe
-sudo add-apt-repository -syn ppa:pipewire-debian/pipewire-upstream || sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
 sudo apt-get update
 sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev
 rustup update
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wayvr/src/overlays/dashboard.rs b/wayvr/src/overlays/dashboard.rs
@@ -481,7 +481,10 @@ impl DashInterface<AppState> for DashInterfaceLive {
     fn get_feats(&mut self, data: &mut AppState) -> dash_interface::InterfaceFeats {
         dash_interface::InterfaceFeats {
             openxr: matches!(data.xr_backend, XrBackend::OpenXR),
+            #[cfg(feature = "openxr")]
             monado: data.monado_state.is_some(),
+            #[cfg(not(feature = "openxr"))]
+            monado: false,
         }
     }
 
diff --git a/wlx-capture/Cargo.toml b/wlx-capture/Cargo.toml
@@ -32,8 +32,8 @@ drm-fourcc = "2.2.0"
 idmap = { workspace = true }
 libc = "0.2.178"
 log = { workspace = true }
-pipewire = { git = "https://gitlab.freedesktop.org/galister/pipewire-rs.git", rev = "6ef2cd1af41e5e8844c63c37ea9a01f0758079b0", features = [
-  "v0_3_33",
+pipewire = { git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", rev = "670b0aabf04263ece5dc1e752e5d64aeae3056e8", features = [
+  "v0_3_33", "v0_3_65",
 ], optional = true }
 #pipewire = { version = "0.8.0", features = ["v0_3_33"], optional = true }
 rxscreen = { version = "0.1.7", features = [
diff --git a/wlx-capture/src/pipewire.rs b/wlx-capture/src/pipewire.rs
