git: bb6b15717eb6 - main - x11-wm/hyprland: update to 0.22.0.b
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Feb 2023 06:11:24 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bb6b15717eb6d9cad9002d79fc1e45aa6ed8023c
commit bb6b15717eb6d9cad9002d79fc1e45aa6ed8023c
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-20 23:17:31 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-21 06:10:12 +0000
x11-wm/hyprland: update to 0.22.0.b
Changes: https://github.com/hyprwm/Hyprland/releases/tag/v0.22.0beta
Reported by: GitHub (watch releases)
---
x11-wm/hyprland/Makefile | 8 +--
x11-wm/hyprland/distinfo | 12 +---
x11-wm/hyprland/files/patch-wlroots-0.16 | 101 ++++++++++++++++++++++++++-----
3 files changed, 90 insertions(+), 31 deletions(-)
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 9dcfaa7a15ca..6ac2a155c985 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,14 +1,8 @@
PORTNAME= hyprland
DISTVERSIONPREFIX= v
-DISTVERSION= 0.21.0beta
-PORTREVISION= 5
+DISTVERSION= 0.22.0beta
CATEGORIES= x11-wm wayland
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= c3adc9ec5602.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1448
-PATCHFILES+= f90ff8303b4f.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1457
-PATCHFILES+= fd3a1cd086d0.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/1477
-
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #'
WWW= https://hyprland.org/
diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo
index 7d2b9231c7c7..c31810a84e15 100644
--- a/x11-wm/hyprland/distinfo
+++ b/x11-wm/hyprland/distinfo
@@ -1,13 +1,7 @@
-TIMESTAMP = 1674930518
-SHA256 (hyprwm-Hyprland-v0.21.0beta_GH0.tar.gz) = 7fb3ba09011c991fcdfbba825cc69af1c9eb0568bc422f95be5cce860baaea1b
-SIZE (hyprwm-Hyprland-v0.21.0beta_GH0.tar.gz) = 714570
+TIMESTAMP = 1676935051
+SHA256 (hyprwm-Hyprland-v0.22.0beta_GH0.tar.gz) = dd721975b15126a8165226d5ab2cbb88c5bd48dd768b6ee123149451af2fb0c1
+SIZE (hyprwm-Hyprland-v0.22.0beta_GH0.tar.gz) = 723020
SHA256 (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 3b3b4e948525f1d823313390b2551ea8969d0cbf82bd72e2a4a2ce2750552330
SIZE (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 4852
SHA256 (llvm-llvm-project-llvmorg-16.0.0-rc2_GH0.tar.gz) = f066ee0f4e48d320a327215359f212164675e75ca7644dbbd54b1828a270b2fc
SIZE (llvm-llvm-project-llvmorg-16.0.0-rc2_GH0.tar.gz) = 179117059
-SHA256 (c3adc9ec5602.patch) = 71e502ca9b18a7e3b29d19ff72493dc511b2b8937ca032db085a273fdd6a8d26
-SIZE (c3adc9ec5602.patch) = 1759
-SHA256 (f90ff8303b4f.patch) = 6b0b3664b44d804bc0a4c686cb44ba0b3fb5612d3f075e3a030a1ed81e34a56a
-SIZE (f90ff8303b4f.patch) = 8448
-SHA256 (fd3a1cd086d0.patch) = 2e495318e236622e371e608a5ab1ed81af9db1e885ef0c8f3183a28862d5397e
-SIZE (fd3a1cd086d0.patch) = 1364
diff --git a/x11-wm/hyprland/files/patch-wlroots-0.16 b/x11-wm/hyprland/files/patch-wlroots-0.16
index 5c7f6318dc45..b82f3f578e4a 100644
--- a/x11-wm/hyprland/files/patch-wlroots-0.16
+++ b/x11-wm/hyprland/files/patch-wlroots-0.16
@@ -4,10 +4,11 @@ use as system package with more than one consumer.
https://github.com/hyprwm/Hyprland/commit/df132e5ff339
https://github.com/hyprwm/Hyprland/commit/c012e3d66b21
https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
+https://github.com/hyprwm/Hyprland/commit/a46abd8b1ada
---- src/Compositor.cpp.orig 2022-12-06 13:15:18 UTC
+--- src/Compositor.cpp.orig 2023-02-03 14:12:28 UTC
+++ src/Compositor.cpp
-@@ -53,7 +53,7 @@ CCompositor::CCompositor() {
+@@ -63,7 +63,7 @@ CCompositor::CCompositor() {
wl_event_loop_add_signal(m_sWLEventLoop, SIGTERM, handleCritSignal, nullptr);
//wl_event_loop_add_signal(m_sWLEventLoop, SIGINT, handleCritSignal, nullptr);
@@ -16,7 +17,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
if (!m_sWLRBackend) {
Debug::log(CRIT, "m_sWLRBackend was NULL!");
-@@ -76,10 +76,11 @@ CCompositor::CCompositor() {
+@@ -86,10 +86,11 @@ CCompositor::CCompositor() {
wlr_renderer_init_wl_shm(m_sWLRRenderer, m_sWLDisplay);
if (wlr_renderer_get_dmabuf_texture_formats(m_sWLRRenderer)) {
@@ -30,7 +31,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
}
m_sWLRAllocator = wlr_allocator_autocreate(m_sWLRBackend, m_sWLRRenderer);
-@@ -131,7 +132,7 @@ CCompositor::CCompositor() {
+@@ -141,7 +142,7 @@ CCompositor::CCompositor() {
m_sWLRIdle = wlr_idle_create(m_sWLDisplay);
@@ -38,8 +39,8 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
+ m_sWLRLayerShell = wlr_layer_shell_v1_create(m_sWLDisplay);
m_sWLRServerDecoMgr = wlr_server_decoration_manager_create(m_sWLDisplay);
- m_sWLRXDGDecoMgr = wlr_xdg_decoration_manager_v1_create(m_sWLDisplay);
-@@ -171,6 +172,8 @@ CCompositor::CCompositor() {
+ m_sWLRXDGDecoMgr = wlr_xdg_decoration_manager_v1_create(m_sWLDisplay);
+@@ -181,6 +182,8 @@ CCompositor::CCompositor() {
wlr_xdg_foreign_v2_create(m_sWLDisplay, m_sWLRForeignRegistry);
m_sWLRPointerGestures = wlr_pointer_gestures_v1_create(m_sWLDisplay);
@@ -48,7 +49,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
m_sWLRTextInputMgr = wlr_text_input_manager_v3_create(m_sWLDisplay);
---- src/events/Events.hpp.orig 2022-12-06 13:15:18 UTC
+--- src/events/Events.hpp.orig 2023-02-03 14:12:28 UTC
+++ src/events/Events.hpp
@@ -96,7 +96,6 @@ namespace Events {
// Monitor part 2 the sequel
@@ -58,9 +59,9 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
// XWayland
LISTENER(readyXWayland);
---- src/events/Monitors.cpp.orig 2023-01-05 22:30:24 UTC
+--- src/events/Monitors.cpp.orig 2023-02-03 14:12:28 UTC
+++ src/events/Monitors.cpp
-@@ -265,10 +265,11 @@ void Events::listener_monitorFrame(void* owner, void*
+@@ -277,10 +277,11 @@ void Events::listener_monitorFrame(void* owner, void*
damageBlinkCleanup = 0;
}
@@ -76,7 +77,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
}
g_pHyprOpenGL->end();
-@@ -339,11 +340,4 @@ void Events::listener_monitorDestroy(void* owner, void
+@@ -351,11 +352,4 @@ void Events::listener_monitorDestroy(void* owner, void
std::erase_if(g_pCompositor->m_vRealMonitors, [&](std::shared_ptr<CMonitor>& el) { return el.get() == pMonitor; });
}
@@ -88,7 +89,18 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
-
- wlr_output_commit_state(PMONITOR->output, E->state);
}
---- src/helpers/Monitor.cpp.orig 2022-12-06 13:15:18 UTC
+--- src/events/Windows.cpp.orig 2023-02-03 14:12:28 UTC
++++ src/events/Windows.cpp
+@@ -816,7 +816,7 @@ void Events::listener_activateXDG(wl_listener* listene
+
+ Debug::log(LOG, "Activate request for surface at %x", E->surface);
+
+- if (!wlr_xdg_surface_try_from_wlr_surface(E->surface))
++ if (!wlr_surface_is_xdg_surface(E->surface))
+ return;
+
+ const auto PWINDOW = g_pCompositor->getWindowFromSurface(E->surface);
+--- src/helpers/Monitor.cpp.orig 2023-02-03 14:12:28 UTC
+++ src/helpers/Monitor.cpp
@@ -5,10 +5,8 @@ void CMonitor::onConnect(bool noRule) {
void CMonitor::onConnect(bool noRule) {
@@ -101,7 +113,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
if (m_bEnabled) {
wlr_output_enable(output, 1);
-@@ -185,7 +183,7 @@ void CMonitor::onDisconnect() {
+@@ -207,7 +205,7 @@ void CMonitor::onDisconnect() {
if (!BACKUPMON) {
Debug::log(WARN, "Unplugged last monitor, entering an unsafe state. Good luck my friend.");
@@ -110,9 +122,9 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
hyprListener_monitorDestroy.removeCallback();
g_pCompositor->m_bUnsafeState = true;
---- src/helpers/Monitor.hpp.orig 2022-12-06 13:15:18 UTC
+--- src/helpers/Monitor.hpp.orig 2023-02-03 14:12:28 UTC
+++ src/helpers/Monitor.hpp
-@@ -56,7 +56,7 @@ class CMonitor { (public)
+@@ -53,7 +53,7 @@ class CMonitor {
DYNLISTENER(monitorFrame);
DYNLISTENER(monitorDestroy);
@@ -121,7 +133,7 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
// hack: a group = workspaces on a monitor.
// I don't really care lol :P
---- src/helpers/SubsurfaceTree.cpp.orig 2022-12-06 13:15:18 UTC
+--- src/helpers/SubsurfaceTree.cpp.orig 2023-02-03 14:12:28 UTC
+++ src/helpers/SubsurfaceTree.cpp
@@ -3,8 +3,8 @@ void addSurfaceGlobalOffset(SSurfaceTreeNode* node, in
#include "../Compositor.hpp"
@@ -134,3 +146,62 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
if (node->offsetfn) {
// This is the root node
+--- src/managers/XWaylandManager.cpp.orig 2023-02-03 14:12:28 UTC
++++ src/managers/XWaylandManager.cpp
+@@ -35,16 +35,16 @@ void CHyprXWaylandManager::activateSurface(wlr_surface
+ if (!pSurface)
+ return;
+
+- if (wlr_xdg_surface_try_from_wlr_surface(pSurface)) {
+- const auto PSURF = wlr_xdg_surface_try_from_wlr_surface(pSurface);
++ if (wlr_surface_is_xdg_surface(pSurface)) {
++ const auto PSURF = wlr_xdg_surface_from_wlr_surface(pSurface);
+ if (PSURF && PSURF->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+ wlr_xdg_toplevel_set_activated(PSURF->toplevel, activate);
+ }
+- } else if (wlr_xwayland_surface_try_from_wlr_surface(pSurface)) {
+- wlr_xwayland_surface_activate(wlr_xwayland_surface_try_from_wlr_surface(pSurface), activate);
++ } else if (wlr_surface_is_xwayland_surface(pSurface)) {
++ wlr_xwayland_surface_activate(wlr_xwayland_surface_from_wlr_surface(pSurface), activate);
+
+ if (activate)
+- wlr_xwayland_surface_restack(wlr_xwayland_surface_try_from_wlr_surface(pSurface), nullptr, XCB_STACK_MODE_ABOVE);
++ wlr_xwayland_surface_restack(wlr_xwayland_surface_from_wlr_surface(pSurface), nullptr, XCB_STACK_MODE_ABOVE);
+ }
+ }
+
+--- src/managers/input/InputMethodRelay.cpp.orig 2023-02-03 14:12:28 UTC
++++ src/managers/input/InputMethodRelay.cpp
+@@ -144,8 +144,8 @@ void CInputMethodRelay::updateInputPopup(SIMEPopup* pP
+ Vector2D parentPos;
+ Vector2D parentSize;
+
+- if (wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE)) {
+- const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE));
++ if (wlr_surface_is_layer_surface(PFOCUSEDSURFACE)) {
++ const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_from_wlr_surface(PFOCUSEDSURFACE));
+
+ if (PLS) {
+ parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition;
+@@ -243,8 +243,8 @@ void CInputMethodRelay::damagePopup(SIMEPopup* pPopup)
+
+ const auto PFOCUSEDSURFACE = PFOCUSEDTI->pWlrInput->focused_surface;
+
+- if (wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE)) {
+- const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE));
++ if (wlr_surface_is_layer_surface(PFOCUSEDSURFACE)) {
++ const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_from_wlr_surface(PFOCUSEDSURFACE));
+
+ if (PLS) {
+ parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition;
+--- src/render/Renderer.cpp.orig 2023-02-03 14:12:28 UTC
++++ src/render/Renderer.cpp
+@@ -37,7 +37,7 @@ void renderSurface(struct wlr_surface* surface, int x,
+ rounding -= 1; // to fix a border issue
+
+ if (RDATA->surface && surface == RDATA->surface) {
+- if (wlr_xwayland_surface_try_from_wlr_surface(surface) && !wlr_xwayland_surface_try_from_wlr_surface(surface)->has_alpha && RDATA->fadeAlpha * RDATA->alpha == 1.f) {
++ if (wlr_surface_is_xwayland_surface(surface) && !wlr_xwayland_surface_from_wlr_surface(surface)->has_alpha && RDATA->fadeAlpha * RDATA->alpha == 1.f) {
+ g_pHyprOpenGL->renderTexture(TEXTURE, &windowBox, RDATA->fadeAlpha * RDATA->alpha, rounding, true);
+ } else {
+ if (RDATA->blur)