summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-wm/cosmic-comp/Makefile2
-rw-r--r--x11-wm/cosmic-comp/Makefile.crates4
-rw-r--r--x11-wm/cosmic-comp/distinfo8
-rw-r--r--x11-wm/cosmic-comp/files/patch-libdisplay-info-0.352
-rw-r--r--x11-wm/niri/Makefile2
-rw-r--r--x11-wm/niri/Makefile.crates4
-rw-r--r--x11-wm/niri/distinfo8
-rw-r--r--x11-wm/niri/files/patch-libdisplay-info-0.350
8 files changed, 80 insertions, 50 deletions
diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 82934897afbc..cf6621deb9db 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cosmic-comp
DISTVERSIONPREFIX= epoch-
DISTVERSION= 1.0.0-alpha.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
index aa6c570116a5..3abde491fb00 100644
--- a/x11-wm/cosmic-comp/Makefile.crates
+++ b/x11-wm/cosmic-comp/Makefile.crates
@@ -251,6 +251,9 @@ CARGO_CRATES= ab_glyph-0.2.29 \
kurbo-0.11.1 \
lazy_static-1.5.0 \
libc-0.2.169 \
+ libdisplay-info-0.3.0 \
+ libdisplay-info-derive-0.1.1 \
+ libdisplay-info-sys-0.3.0 \
libloading-0.8.6 \
libm-0.2.11 \
libredox-0.1.3 \
@@ -633,7 +636,6 @@ CARGO_CRATES= ab_glyph-0.2.29 \
atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \
iced_glyphon@git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev\#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b \
clipboard_macos,clipboard_wayland,clipboard_x11,dnd,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2\#6b9faab87bea9cebec6ae036906fd67fed254f5f \
- libdisplay-info,libdisplay-info-derive,libdisplay-info-sys@git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0\#5b706d544d87f1bcae4c5ba97b281a8ab16754ed \
softbuffer@git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0\#6e75b1ad7e98397d37cb187886d05969bc480995 \
cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb \
cosmic-client-toolkit,cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#bc4af9183e0967802d7fbe91ba811a29ca6a3b67 \
diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
index b28cba9d2342..014561b41590 100644
--- a/x11-wm/cosmic-comp/distinfo
+++ b/x11-wm/cosmic-comp/distinfo
@@ -505,6 +505,12 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591
SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a
SIZE (rust/crates/libc-0.2.169.crate) = 757901
+SHA256 (rust/crates/libdisplay-info-0.3.0.crate) = 59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359
+SIZE (rust/crates/libdisplay-info-0.3.0.crate) = 40051
+SHA256 (rust/crates/libdisplay-info-derive-0.1.1.crate) = 8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98
+SIZE (rust/crates/libdisplay-info-derive-0.1.1.crate) = 4048
+SHA256 (rust/crates/libdisplay-info-sys-0.3.0.crate) = 26590d55b8819f9c6b0d95d9d12dc9edbfd1f2413e88814a33b631ac049bb51f
+SIZE (rust/crates/libdisplay-info-sys-0.3.0.crate) = 79126
SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34
SIZE (rust/crates/libloading-0.8.6.crate) = 28922
SHA256 (rust/crates/libm-0.2.11.crate) = 8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa
@@ -1269,8 +1275,6 @@ SHA256 (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = ec5f82cdbf5f5c0a7313cad64de78
SIZE (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = 183465
SHA256 (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 2181c53f2fe5d373cedfa7fe826bab04cbdd39fdbcb77920bbcc9f41a9cca79c
SIZE (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 24227
-SHA256 (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 1f61882dcb638b790369d1f09e41ec4b4d24ec15abef2abf3b00e01399121ab5
-SIZE (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 119266
SHA256 (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 980f30eb5afc07acdec43f181a9e745cb7a887a6dff7e06dc9199748b2487569
SIZE (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 165853
SHA256 (pop-os-libcosmic-8a0e74b189f53dae9b8001c6fa5cf1820b3ececb_GH0.tar.gz) = 7891bf08e33aef4d59046e038e5eb47e3144d06e12888161d5a1fbbd49fd9b33
diff --git a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3
index 679912dccc17..32e5646da1a5 100644
--- a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3
+++ b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3
@@ -2,51 +2,59 @@ https://github.com/Smithay/libdisplay-info-rs/pull/17
--- Cargo.lock.orig 2025-04-24 10:45:50 UTC
+++ Cargo.lock
-@@ -2900,9 +2900,8 @@ name = "libdisplay-info"
+@@ -2900,9 +2900,9 @@ name = "libdisplay-info"
[[package]]
name = "libdisplay-info"
-version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b"
-+version = "0.2.3"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
++checksum = "59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359"
dependencies = [
"bitflags 2.8.0",
"libc",
-@@ -2913,9 +2912,8 @@ name = "libdisplay-info-derive"
+@@ -2913,9 +2913,9 @@ name = "libdisplay-info-derive"
[[package]]
name = "libdisplay-info-derive"
-version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee"
+version = "0.1.1"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee"
++checksum = "8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98"
dependencies = [
"proc-macro2",
"quote",
-@@ -2924,9 +2922,8 @@ name = "libdisplay-info-sys"
+@@ -2924,9 +2924,9 @@ name = "libdisplay-info-sys"
[[package]]
name = "libdisplay-info-sys"
-version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c"
+version = "0.3.0"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c"
++checksum = "26590d55b8819f9c6b0d95d9d12dc9edbfd1f2413e88814a33b631ac049bb51f"
dependencies = [
"semver",
"system-deps",
--- Cargo.toml.orig 2025-04-24 10:45:50 UTC
+++ Cargo.toml
-@@ -118,6 +118,9 @@ lto = "fat"
- [profile.release]
- lto = "fat"
-
-+[ patch.crates-io]
-+libdisplay-info = { git = "https://github.com/Smithay/libdisplay-info-rs", branch = "feature/0.3.0" }
-+
- [patch."https://github.com/pop-os/cosmic-protocols"]
- cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
- cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
+@@ -20,7 +20,7 @@ cosmic-text = { git = "https://github.com/pop-os/cosmi
+ cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", rev = "e706814", default-features = false, features = ["server"]}
+ cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" }
+ cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", features = ["shape-run-cache"] }
+-libdisplay-info = "0.2.0"
++libdisplay-info = "0.3.0"
+ egui = {version = "0.30.0", optional = true}
+ egui_plot = {version = "0.30.0", optional = true}
+ i18n-embed = {version = "0.14", features = ["fluent-system", "desktop-requester"]}
+--- cosmic-comp-config/Cargo.toml.orig 2025-04-24 10:45:50 UTC
++++ cosmic-comp-config/Cargo.toml
+@@ -6,5 +6,5 @@ input = "0.9.0"
+ [dependencies]
+ cosmic-config = { git = "https://github.com/pop-os/libcosmic/" }
+ input = "0.9.0"
+-libdisplay-info = { version = "0.2.0", optional = true }
++libdisplay-info = { version = "0.3.0", optional = true }
+ serde = { version = "1", features = ["derive"] }
diff --git a/x11-wm/niri/Makefile b/x11-wm/niri/Makefile
index f8f42f2a303e..f39308f8966b 100644
--- a/x11-wm/niri/Makefile
+++ b/x11-wm/niri/Makefile
@@ -1,7 +1,7 @@
PORTNAME= niri
DISTVERSIONPREFIX= v
DISTVERSION= 25.08
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11-wm/niri/Makefile.crates b/x11-wm/niri/Makefile.crates
index 2e6e0f7b71d7..a891ee201b99 100644
--- a/x11-wm/niri/Makefile.crates
+++ b/x11-wm/niri/Makefile.crates
@@ -204,6 +204,9 @@ CARGO_CRATES= accesskit-0.21.0 \
libadwaita-0.7.2 \
libadwaita-sys-0.7.2 \
libc-0.2.175 \
+ libdisplay-info-0.3.0 \
+ libdisplay-info-derive-0.1.1 \
+ libdisplay-info-sys-0.3.0 \
libloading-0.8.8 \
libm-0.2.15 \
libredox-0.1.9 \
@@ -503,6 +506,5 @@ CARGO_CRATES= accesskit-0.21.0 \
zvariant-5.7.0 \
zvariant_derive-5.7.0 \
zvariant_utils-3.2.1 \
- libdisplay-info,libdisplay-info-derive,libdisplay-info-sys@git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0\#5b706d544d87f1bcae4c5ba97b281a8ab16754ed \
libspa,libspa-sys,pipewire,pipewire-sys@git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git\#93138d01b23628521b29b5604bbebe991cba4c65 \
smithay,smithay-drm-extras@git+https://github.com/Smithay/smithay.git\#20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6
diff --git a/x11-wm/niri/distinfo b/x11-wm/niri/distinfo
index 0e7649d8dbeb..9e09e7c6218c 100644
--- a/x11-wm/niri/distinfo
+++ b/x11-wm/niri/distinfo
@@ -411,6 +411,12 @@ SHA256 (rust/crates/libadwaita-sys-0.7.2.crate) = 6680988058c2558baf3f548a370e4e
SIZE (rust/crates/libadwaita-sys-0.7.2.crate) = 35416
SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543
SIZE (rust/crates/libc-0.2.175.crate) = 788728
+SHA256 (rust/crates/libdisplay-info-0.3.0.crate) = 59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359
+SIZE (rust/crates/libdisplay-info-0.3.0.crate) = 40051
+SHA256 (rust/crates/libdisplay-info-derive-0.1.1.crate) = 8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98
+SIZE (rust/crates/libdisplay-info-derive-0.1.1.crate) = 4048
+SHA256 (rust/crates/libdisplay-info-sys-0.3.0.crate) = 26590d55b8819f9c6b0d95d9d12dc9edbfd1f2413e88814a33b631ac049bb51f
+SIZE (rust/crates/libdisplay-info-sys-0.3.0.crate) = 79126
SHA256 (rust/crates/libloading-0.8.8.crate) = 07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667
SIZE (rust/crates/libloading-0.8.8.crate) = 31345
SHA256 (rust/crates/libm-0.2.15.crate) = f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de
@@ -1009,8 +1015,6 @@ SHA256 (rust/crates/zvariant_derive-5.7.0.crate) = 6643fd0b26a46d226bd90d3f07c1b
SIZE (rust/crates/zvariant_derive-5.7.0.crate) = 14214
SHA256 (rust/crates/zvariant_utils-3.2.1.crate) = c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599
SIZE (rust/crates/zvariant_utils-3.2.1.crate) = 14678
-SHA256 (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 1f61882dcb638b790369d1f09e41ec4b4d24ec15abef2abf3b00e01399121ab5
-SIZE (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 119266
SHA256 (pipewire-pipewire-rs-93138d01b23628521b29b5604bbebe991cba4c65_GL0.tar.gz) = dc041defb2be7288e87d5a91f0a1f9960461e850b2c2b09f4afbedf371ea39db
SIZE (pipewire-pipewire-rs-93138d01b23628521b29b5604bbebe991cba4c65_GL0.tar.gz) = 114280
SHA256 (Smithay-smithay-20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6_GH0.tar.gz) = 1a97be0d3ac477a92c54547cc912ecb8452272d7d8a8435198e53129b6e5aa6c
diff --git a/x11-wm/niri/files/patch-libdisplay-info-0.3 b/x11-wm/niri/files/patch-libdisplay-info-0.3
index b4d40b1e5d8c..b2f31a0a38f6 100644
--- a/x11-wm/niri/files/patch-libdisplay-info-0.3
+++ b/x11-wm/niri/files/patch-libdisplay-info-0.3
@@ -2,51 +2,61 @@ https://github.com/Smithay/libdisplay-info-rs/pull/17
--- Cargo.lock.orig 2025-08-30 12:18:41 UTC
+++ Cargo.lock
-@@ -2082,9 +2082,8 @@ name = "libdisplay-info"
+@@ -2082,9 +2082,9 @@ name = "libdisplay-info"
[[package]]
name = "libdisplay-info"
-version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b"
-+version = "0.2.3"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
++checksum = "59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359"
dependencies = [
"bitflags 2.9.3",
"libc",
-@@ -2095,9 +2094,8 @@ name = "libdisplay-info-derive"
+@@ -2095,9 +2095,9 @@ name = "libdisplay-info-derive"
[[package]]
name = "libdisplay-info-derive"
-version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee"
+version = "0.1.1"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee"
++checksum = "8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98"
dependencies = [
"proc-macro2",
"quote",
-@@ -2106,9 +2104,8 @@ name = "libdisplay-info-sys"
+@@ -2106,9 +2106,9 @@ name = "libdisplay-info-sys"
[[package]]
name = "libdisplay-info-sys"
-version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c"
+version = "0.3.0"
-+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c"
++checksum = "26590d55b8819f9c6b0d95d9d12dc9edbfd1f2413e88814a33b631ac049bb51f"
dependencies = [
"semver",
"system-deps",
--- Cargo.toml.orig 2025-08-30 12:18:41 UTC
+++ Cargo.toml
-@@ -124,6 +124,9 @@ xshell = "0.2.7"
- wayland-client = "0.31.11"
- xshell = "0.2.7"
+@@ -72,7 +72,7 @@ libc = "0.2.175"
+ input = { version = "0.9.1", features = ["libinput_1_21"] }
+ keyframe = { version = "1.1.1", default-features = false }
+ libc = "0.2.175"
+-libdisplay-info = "0.2.2"
++libdisplay-info = "0.3.0"
+ log = { version = "0.4.27", features = ["max_level_trace", "release_max_level_debug"] }
+ niri-config = { version = "25.8.0", path = "niri-config" }
+ niri-ipc = { version = "25.8.0", path = "niri-ipc", features = ["clap"] }
+--- ../smithay-20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6/smithay-drm-extras/Cargo.toml.orig 2025-08-21 10:00:27 UTC
++++ ../smithay-20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6/smithay-drm-extras/Cargo.toml
+@@ -6,7 +6,7 @@ authors = ["Bartłomiej Maryńczak <marynczakbartlomie
+ authors = ["Bartłomiej Maryńczak <marynczakbartlomiej@gmail.com>"]
+
+ [dependencies]
+-libdisplay-info = { version = "0.2.1", optional = true }
++libdisplay-info = { version = "0.3.0", optional = true }
+ drm = { version = "0.14.0" }
-+[patch.crates-io]
-+libdisplay-info = { git = "https://github.com/Smithay/libdisplay-info-rs", branch = "feature/0.3.0" }
-+
[features]
- default = ["dbus", "systemd", "xdp-gnome-screencast"]
- # Enables D-Bus support (serve various freedesktop and GNOME interfaces, accessibility tree, power button handling).
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-14 08:06:13 +0000