From fd85ef39369f95eed67fdf3f025e86916edeea2f Mon Sep 17 00:00:00 2001 From: Honkazel <169346573+Honkazel@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:31:04 +0500 Subject: [PATCH] core: move to stable/linux-dmabuf-v1 instead of unstable (#299) * dmabuf-v1 instead of dmabuf-unstable-v1 * meson: dmabuf-unstable-v1 -> dmabuf-v1 * PortalManager: dmabuf-unstable -> dmabuf * Screencopy: dmabuf-unstable -> dmabuf * flake.lock: update --------- Co-authored-by: Mihai Fufezan --- CMakeLists.txt | 2 +- flake.lock | 12 ++++++------ protocols/meson.build | 2 +- src/core/PortalManager.hpp | 4 ++-- src/portals/Screencopy.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f88645..871ca3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ protocolnew("${HYPRLAND_PROTOCOLS}/protocols" "hyprland-global-shortcuts-v1" true) protocolnew("${HYPRLAND_PROTOCOLS}/protocols" "hyprland-toplevel-export-v1" true) -protocolnew("unstable/linux-dmabuf" "linux-dmabuf-unstable-v1" false) +protocolnew("stable/linux-dmabuf" "linux-dmabuf-v1" false) # Installation install(TARGETS hyprland-share-picker) diff --git a/flake.lock b/flake.lock index a54d824..7ce4b5b 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { diff --git a/protocols/meson.build b/protocols/meson.build index 3910e24..f10d4c8 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -22,7 +22,7 @@ client_protocols = [ 'wlr-foreign-toplevel-management-unstable-v1.xml', hl_protocol_dir / 'protocols/hyprland-toplevel-export-v1.xml', hl_protocol_dir / 'protocols/hyprland-global-shortcuts-v1.xml', - wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml', + wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml', ] wl_proto_files = [] diff --git a/src/core/PortalManager.hpp b/src/core/PortalManager.hpp index 915a14b..e0f2f03 100644 --- a/src/core/PortalManager.hpp +++ b/src/core/PortalManager.hpp @@ -15,7 +15,7 @@ #include "hyprland-toplevel-export-v1.hpp" #include "hyprland-global-shortcuts-v1.hpp" -#include "linux-dmabuf-unstable-v1.hpp" +#include "linux-dmabuf-v1.hpp" #include "wlr-foreign-toplevel-management-unstable-v1.hpp" #include "wlr-screencopy-unstable-v1.hpp" @@ -122,4 +122,4 @@ class CPortalManager { std::mutex m_mEventLock; }; -inline std::unique_ptr g_pPortalManager; \ No newline at end of file +inline std::unique_ptr g_pPortalManager; diff --git a/src/portals/Screencopy.cpp b/src/portals/Screencopy.cpp index 6fd6dfc..2363716 100644 --- a/src/portals/Screencopy.cpp +++ b/src/portals/Screencopy.cpp @@ -5,7 +5,7 @@ #include #include -#include "linux-dmabuf-unstable-v1.hpp" +#include "linux-dmabuf-v1.hpp" #include constexpr static int MAX_RETRIES = 10;