Skip to content

Commit 34b398f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into force_render
2 parents 760dc78 + b35bcae commit 34b398f

37 files changed

+287
-243
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ jobs:
246246
- run: cargo build --all
247247

248248
freebsd:
249+
if: false # Waiting for a new version of the pipewire-rs patch.
249250
runs-on: ubuntu-24.04
250251
env:
251252
CARGO_HOME: /home/runner/work/niri/niri/cargo-home

Cargo.lock

Lines changed: 25 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ members = [
66
]
77

88
[workspace.package]
9-
version = "25.8.0"
9+
version = "25.11.0"
1010
description = "A scrollable-tiling Wayland compositor"
1111
authors = ["Ivan Molodetskikh <[email protected]>"]
1212
license = "GPL-3.0-or-later"
@@ -26,7 +26,7 @@ tracing = { version = "0.1.41", features = ["max_level_trace", "release_max_leve
2626
# everyone who relied on them for color output, with no fallback available.
2727
# https://github.com/tokio-rs/tracing/issues/3378
2828
tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] }
29-
tracy-client = { version = "0.18.2", default-features = false }
29+
tracy-client = { version = "0.18.3", default-features = false }
3030

3131
[workspace.dependencies.smithay]
3232
# version = "0.4.1"
@@ -77,12 +77,12 @@ keyframe = { version = "1.1.1", default-features = false }
7777
libc = "0.2.176"
7878
libdisplay-info = "0.3.0"
7979
log = { version = "0.4.28", features = ["max_level_trace", "release_max_level_debug"] }
80-
niri-config = { version = "25.8.0", path = "niri-config" }
81-
niri-ipc = { version = "25.8.0", path = "niri-ipc", features = ["clap"] }
80+
niri-config = { version = "25.11.0", path = "niri-config" }
81+
niri-ipc = { version = "25.11.0", path = "niri-ipc", features = ["clap"] }
8282
ordered-float = "5.1.0"
8383
pango = { version = "0.20.12", features = ["v1_44"] }
8484
pangocairo = "0.20.10"
85-
pipewire = { git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", optional = true, features = ["v0_3_33"] }
85+
pipewire = { version = "0.9.2", optional = true, features = ["v0_3_33"] }
8686
png = "0.18.0"
8787
portable-atomic = { version = "1.11.1", default-features = false, features = ["float"] }
8888
profiling = "1.0.17"
@@ -161,7 +161,7 @@ insta.opt-level = 3
161161
similar.opt-level = 3
162162

163163
[package.metadata.generate-rpm]
164-
version = "25.08"
164+
version = "25.11"
165165
assets = [
166166
{ source = "target/release/niri", dest = "/usr/bin/", mode = "755" },
167167
{ source = "resources/niri-session", dest = "/usr/bin/", mode = "755" },

docs/wiki/Accessibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Specifically, niri will announce:
1010

1111
- workspace switching, for example it'll say "Workspace 2" when you switch to the second workspace;
1212
- the exit confirmation dialog (appears on <kbd>Super</kbd><kbd>Shift</kbd><kbd>E</kbd> by default);
13-
- <sup>Since: next release</sup> niri has an <kbd>Alt</kbd><kbd>Tab</kbd> window switcher where it will announce the selected window title;
13+
- <sup>Since: 25.11</sup> niri has an <kbd>Alt</kbd><kbd>Tab</kbd> window switcher where it will announce the selected window title;
1414
- entering the screenshot UI and the overview (niri will say when these are focused, nothing else for now);
1515
- whenever a config parse error occurs;
1616
- the important hotkeys list (for now, as one big announcement without tab navigation; appears on <kbd>Super</kbd><kbd>Shift</kbd><kbd>/</kbd> by default).

docs/wiki/Configuration:-Animations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ animations {
428428

429429
#### `recent-windows-close`
430430

431-
<sup>Since: next release</sup>
431+
<sup>Since: 25.11</sup>
432432

433433
The close fade-out animation of the recent windows switcher.
434434

docs/wiki/Configuration:-Debug-Options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ debug {
118118

119119
### `ignore-drm-device`
120120

121-
<sup>Since: next release</sup>
121+
<sup>Since: 25.11</sup>
122122

123123
List DRM devices that niri will ignore.
124124
Useful for GPU passthrough when you don't want niri to open a certain device.
@@ -319,7 +319,7 @@ Apparently, setting max bpc to 8 breaks some displays driven by AMDGPU.
319319
If this happens to you, set this debug flag, which will prevent niri from changing max bpc.
320320
AMDGPU bug report: https://gitlab.freedesktop.org/drm/amd/-/issues/4487.
321321

322-
<sup>Since: next release</sup>
322+
<sup>Since: 25.11</sup>
323323
This setting is deprecated and does nothing: niri no longer sets max bpc.
324324
The old niri behavior with this setting enabled matches the new behavior.
325325

docs/wiki/Configuration:-Gestures.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ gestures {
9999
}
100100
```
101101

102-
<sup>Since: next release</sup> You can choose specific hot corners by name: `top-left`, `top-right`, `bottom-left`, `bottom-right`.
102+
<sup>Since: 25.11</sup> You can choose specific hot corners by name: `top-left`, `top-right`, `bottom-left`, `bottom-right`.
103103
If no corners are explicitly set, the top-left corner will be active by default.
104104

105105
```kdl

docs/wiki/Configuration:-Include.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<sup>Since: next release</sup>
1+
<sup>Since: 25.11</sup>
22

33
You can include other files at the top level of the config.
44

docs/wiki/Configuration:-Input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Settings specific to `tablet` and `touch`:
261261

262262
- `calibration-matrix`: set to six floating point numbers to change the calibration matrix. See the [`LIBINPUT_CALIBRATION_MATRIX` documentation](https://wayland.freedesktop.org/libinput/doc/latest/device-configuration-via-udev.html) for examples.
263263
- <sup>Since: 25.02</sup> for `tablet`
264-
- <sup>Since: next release</sup> for `touch`
264+
- <sup>Since: 25.11</sup> for `touch`
265265

266266
Tablets and touchscreens are absolute pointing devices that can be mapped to a specific output like so:
267267

docs/wiki/Configuration:-Layout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ layout {
9797
}
9898
```
9999

100-
<sup>Since: next release</sup> You can override these settings for specific [outputs](./Configuration:-Outputs.md#layout-config-overrides) and [named workspaces](./Configuration:-Named-Workspaces.md#layout-config-overrides).
100+
<sup>Since: 25.11</sup> You can override these settings for specific [outputs](./Configuration:-Outputs.md#layout-config-overrides) and [named workspaces](./Configuration:-Named-Workspaces.md#layout-config-overrides).
101101

102102
### `gaps`
103103

0 commit comments

Comments
 (0)