x11-toolkits/wlroots-devel: update to 0.16.0.643

Changes:	https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/bbd53b3b46...214df8eda0

4 files changed, 126 insertions, 6 deletions

diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile
index 55f697dfe8e1..bfe0f3800aa4 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wlroots
-DISTVERSION=	0.16.0-623
+DISTVERSION=	0.16.0-643
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
@@ -27,7 +27,7 @@ USE_GL=		gbm
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
-GL_COMMIT=	bbd53b3b46312840f1e699c7a8c49ccadfc438b4
+GL_COMMIT=	214df8eda07d18b032abfcf525c8344e077c0c7e
 MESON_ARGS=	-Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
 
 .ifdef PKGNAMESUFFIX
diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo
index fa482b06b1c7..bda10a53af3a 100644
--- a/x11-toolkits/wlroots-devel/distinfo
+++ b/x11-toolkits/wlroots-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1688220330
-SHA256 (wlroots-wlroots-bbd53b3b46312840f1e699c7a8c49ccadfc438b4_GL0.tar.gz) = d4ab00b07639478569a2118119921575e8e11db94be6495f8e6ed2194c436ce7
-SIZE (wlroots-wlroots-bbd53b3b46312840f1e699c7a8c49ccadfc438b4_GL0.tar.gz) = 631453
+TIMESTAMP = 1688370414
+SHA256 (wlroots-wlroots-214df8eda07d18b032abfcf525c8344e077c0c7e_GL0.tar.gz) = 42f1ea360ac5aa24ff7f6af55d6b1542e5406438300dc13d8c8ef630d79e89c5
+SIZE (wlroots-wlroots-214df8eda07d18b032abfcf525c8344e077c0c7e_GL0.tar.gz) = 631599
 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
 SIZE (10f80a8f1bb2.patch) = 6097
 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 869a838aed92..b52673d17ec9 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.26.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/x11-wm/hyprland/files/patch-wlroots-0.17 b/x11-wm/hyprland/files/patch-wlroots-0.17
new file mode 100644
index 000000000000..526c8fbc4031
--- /dev/null
+++ b/x11-wm/hyprland/files/patch-wlroots-0.17
@@ -0,0 +1,120 @@
+Apply https://github.com/swaywm/sway/commit/6f1a3b6652b9
+
+../src/Compositor.cpp:461:5: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+    wlr_xcursor_manager_set_cursor_image(m_sWLRXCursorMgr, "left_ptr", m_sWLRCursor);
+    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/render/Renderer.cpp:1898:17: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+                wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
+                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:295:21: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+                    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
+                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:297:21: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+                    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
+                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:470:9: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+        wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
+        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:496:13: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+            wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
+            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:508:13: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+            wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
+            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:1431:5: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, name.c_str(), g_pCompositor->m_sWLRCursor);
+    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../src/managers/input/InputManager.cpp:1441:9: error: use of undeclared identifier 'wlr_xcursor_manager_set_cursor_image'; did you mean 'wlr_xcursor_manager_get_xcursor'?
+        wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
+        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- src/Compositor.cpp.orig	2023-07-11 02:50:09 UTC
++++ src/Compositor.cpp
+@@ -458,7 +458,7 @@ void CCompositor::startCompositor() {
+         throw std::runtime_error("The backend could not start!");
+     }
+ 
+-    wlr_xcursor_manager_set_cursor_image(m_sWLRXCursorMgr, "left_ptr", m_sWLRCursor);
++    wlr_cursor_set_xcursor(m_sWLRCursor, m_sWLRXCursorMgr, "left_ptr");
+ 
+ #ifdef USES_SYSTEMD
+     if (sd_booted() > 0)
+--- src/managers/input/InputManager.cpp.orig	2023-05-29 17:17:38 UTC
++++ src/managers/input/InputManager.cpp
+@@ -292,9 +292,9 @@ void CInputManager::mouseMoveUnified(uint32_t time, bo
+             if (g_pHyprRenderer->m_bHasARenderedCursor) {
+                 // TODO: maybe wrap?
+                 if (m_ecbClickBehavior == CLICKMODE_KILL)
+-                    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
++                    wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "crosshair");
+                 else
+-                    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
++                    wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "left_ptr");
+             }
+ 
+             m_bEmptyFocusCursorSet = true;
+@@ -361,7 +361,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bo
+         // if (!m_bCursorImageOverridden) {
+         //     if (!VECINRECT(m_vLastCursorPosFloored, pFoundWindow->m_vRealPosition.vec().x, pFoundWindow->m_vRealPosition.vec().y,
+         //                    pFoundWindow->m_vRealPosition.vec().x + pFoundWindow->m_vRealSize.vec().x, pFoundWindow->m_vRealPosition.vec().y + pFoundWindow->m_vRealSize.vec().y)) {
+-        //         wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
++        //         wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "left_ptr");
+         //         cursorSurfaceInfo.bUsed = false;
+         //     } else if (!cursorSurfaceInfo.bUsed) {
+         //         cursorSurfaceInfo.bUsed = true;
+@@ -467,7 +467,7 @@ void CInputManager::processMouseRequest(wlr_seat_point
+     }
+ 
+     if (m_ecbClickBehavior == CLICKMODE_KILL) {
+-        wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
++        wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "crosshair");
+         return;
+     }
+ 
+@@ -493,7 +493,7 @@ void CInputManager::setClickMode(eClickBehaviorMode mo
+         case CLICKMODE_DEFAULT:
+             Debug::log(LOG, "SetClickMode: DEFAULT");
+             m_ecbClickBehavior = CLICKMODE_DEFAULT;
+-            wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
++            wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "left_ptr");
+             break;
+ 
+         case CLICKMODE_KILL:
+@@ -505,7 +505,7 @@ void CInputManager::setClickMode(eClickBehaviorMode mo
+             refocus();
+ 
+             // set cursor
+-            wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "crosshair", g_pCompositor->m_sWLRCursor);
++            wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "crosshair");
+             break;
+         default: break;
+     }
+@@ -1428,7 +1428,7 @@ void CInputManager::setCursorImageUntilUnset(std::stri
+ }
+ 
+ void CInputManager::setCursorImageUntilUnset(std::string name) {
+-    wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, name.c_str(), g_pCompositor->m_sWLRCursor);
++    wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, name.c_str());
+     m_bCursorImageOverridden = true;
+ }
+ 
+@@ -1438,7 +1438,7 @@ void CInputManager::unsetCursorImage() {
+ 
+     m_bCursorImageOverridden = false;
+     if (!g_pHyprRenderer->m_bWindowRequestedCursorHide)
+-        wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
++        wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "left_ptr");
+ }
+ 
+ std::string CInputManager::deviceNameToInternalString(std::string in) {
+--- src/render/Renderer.cpp.orig	2023-07-11 02:50:09 UTC
++++ src/render/Renderer.cpp
+@@ -1895,7 +1895,7 @@ void CHyprRenderer::ensureCursorRenderingMode() {
+             m_bHasARenderedCursor = true;
+ 
+             if (!m_bWindowRequestedCursorHide)
+-                wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
++                wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, "left_ptr");
+ 
+             Debug::log(LOG, "Showing the cursor (timeout)");
+