hyprwm/xdg-desktop-portal-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git synced 2024-12-22 01:39:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: move to stable/linux-dmabuf-v1 instead of unstable (#299)

Browse source 
* 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 <mihai@fufexan.net>
This commit is contained in:
Honkazel 2024-12-02 21:31:04 +05:00 committed by GitHub
parent 8070f36dee
commit fd85ef3936
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -130,7 +130,7 @@ protocolnew("${HYPRLAND_PROTOCOLS}/protocols" "hyprland-global-shortcuts-v1"
true) true)
protocolnew("${HYPRLAND_PROTOCOLS}/protocols" "hyprland-toplevel-export-v1" protocolnew("${HYPRLAND_PROTOCOLS}/protocols" "hyprland-toplevel-export-v1"
true) true)
protocolnew("unstable/linux-dmabuf" "linux-dmabuf-unstable-v1" false) protocolnew("stable/linux-dmabuf" "linux-dmabuf-v1" false)
# Installation # Installation
install(TARGETS hyprland-share-picker) install(TARGETS hyprland-share-picker)

12
flake.lock
View file

@ -82,11 +82,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728941256, "lastModified": 1732288281,
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1732837521,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
protocols/meson.build
View file

@ -22,7 +22,7 @@ client_protocols = [
'wlr-foreign-toplevel-management-unstable-v1.xml', 'wlr-foreign-toplevel-management-unstable-v1.xml',
hl_protocol_dir / 'protocols/hyprland-toplevel-export-v1.xml', hl_protocol_dir / 'protocols/hyprland-toplevel-export-v1.xml',
hl_protocol_dir / 'protocols/hyprland-global-shortcuts-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 = [] wl_proto_files = []

4
src/core/PortalManager.hpp
View file

@ -15,7 +15,7 @@
#include "hyprland-toplevel-export-v1.hpp" #include "hyprland-toplevel-export-v1.hpp"
#include "hyprland-global-shortcuts-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-foreign-toplevel-management-unstable-v1.hpp"
#include "wlr-screencopy-unstable-v1.hpp" #include "wlr-screencopy-unstable-v1.hpp"
@ -122,4 +122,4 @@ class CPortalManager {
std::mutex m_mEventLock; std::mutex m_mEventLock;
}; };
inline std::unique_ptr<CPortalManager> g_pPortalManager; inline std::unique_ptr<CPortalManager> g_pPortalManager;

2
src/portals/Screencopy.cpp
View file

@ -5,7 +5,7 @@
#include <libdrm/drm_fourcc.h> #include <libdrm/drm_fourcc.h>
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
#include "linux-dmabuf-unstable-v1.hpp" #include "linux-dmabuf-v1.hpp"
#include <unistd.h> #include <unistd.h>
constexpr static int MAX_RETRIES = 10; constexpr static int MAX_RETRIES = 10;