Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use stable/linux-dmabuf-v1 instead of unstable/linux-dmabuf-unstable-v1 #299

Merged
merged 5 commits into from
Dec 2, 2024
Merged

use stable/linux-dmabuf-v1 instead of unstable/linux-dmabuf-unstable-v1 #299

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4883191
dmabuf-v1 instead of dmabuf-unstable-v1
Honkazel Nov 29, 2024
2ffa79c
meson: dmabuf-unstable-v1 -> dmabuf-v1
Honkazel Nov 29, 2024
c23307c
PortalManager: dmabuf-unstable -> dmabuf
Honkazel Nov 29, 2024
d8bc0ed
Screencopy: dmabuf-unstable -> dmabuf
Honkazel Nov 29, 2024
36c671f
flake.lock: update
fufexan Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion protocols/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
4 changes: 2 additions & 2 deletions src/core/PortalManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -122,4 +122,4 @@ class CPortalManager {
std::mutex m_mEventLock;
};

inline std::unique_ptr<CPortalManager> g_pPortalManager;
inline std::unique_ptr<CPortalManager> g_pPortalManager;
2 changes: 1 addition & 1 deletion src/portals/Screencopy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <libdrm/drm_fourcc.h>
#include <pipewire/pipewire.h>
#include "linux-dmabuf-unstable-v1.hpp"
#include "linux-dmabuf-v1.hpp"
#include <unistd.h>

constexpr static int MAX_RETRIES = 10;
Expand Down
Loading