Date: Sun, 16 Jul 2023 11:24:20 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 27b50932c7ab - main - x11-toolkits/wlroots-devel: update to 0.16.0.656 Message-ID: <202307161124.36GBOKdx065883@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=27b50932c7ab099f48afb53ce3ea2d8facac1caa commit 27b50932c7ab099f48afb53ce3ea2d8facac1caa Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-07-16 09:55:09 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-07-16 11:23:23 +0000 x11-toolkits/wlroots-devel: update to 0.16.0.656 Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/88942d43fd...b18c76642a --- x11-toolkits/wlroots-devel/Makefile | 4 ++-- x11-toolkits/wlroots-devel/distinfo | 6 +++--- x11-wm/hyprland/Makefile | 3 ++- x11-wm/hyprland/files/patch-wlroots-0.17 | 29 ++++++++++++++++++++++++++++- x11-wm/sway-devel/Makefile | 6 +++--- x11-wm/sway-devel/distinfo | 6 +++--- 6 files changed, 41 insertions(+), 13 deletions(-) diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index e95f3fdb2469..4174194cf34c 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= wlroots -DISTVERSION= 0.16.0-651 -DISTVERSIONSUFFIX= -g88942d43fd +DISTVERSION= 0.16.0-656 +DISTVERSIONSUFFIX= -gb18c76642a CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index bae680c602d5..e01c9d7de406 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1689339973 -SHA256 (wlroots-0.16.0-651-g88942d43fd.tar.bz2) = cba3a3642550b5a7a24bea2c544266873c5af5e752d3c06d3021bb910d9c3361 -SIZE (wlroots-0.16.0-651-g88942d43fd.tar.bz2) = 473827 +TIMESTAMP = 1689501309 +SHA256 (wlroots-0.16.0-656-gb18c76642a.tar.bz2) = 98850aa24f35bd1edf1adb02b8da9ddbc7551a9e74fd7e63e0ae90a40024dbfd +SIZE (wlroots-0.16.0-656-gb18c76642a.tar.bz2) = 474185 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 9d01fcb6c4e5..d12521ecabb9 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,6 +1,7 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.27.0 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.25:graphics/wayland-protocols \ - wlroots>=0.16.0.529<0.17.0:x11-toolkits/wlroots + wlroots>=0.16.0.654<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ diff --git a/x11-wm/hyprland/files/patch-wlroots-0.17 b/x11-wm/hyprland/files/patch-wlroots-0.17 index 526c8fbc4031..823cf84594f1 100644 --- a/x11-wm/hyprland/files/patch-wlroots-0.17 +++ b/x11-wm/hyprland/files/patch-wlroots-0.17 @@ -28,6 +28,15 @@ Apply https://github.com/swaywm/sway/commit/6f1a3b6652b9 wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Apply https://github.com/swaywm/sway/commit/91079079690c + +../src/render/Renderer.cpp:60:9: error: use of undeclared identifier 'wlr_presentation_surface_sampled_on_output'; did you mean 'wlr_presentation_surface_textured_on_output'? + wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, surface, RDATA->pMonitor->output); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +../src/render/Renderer.cpp:780:5: error: use of undeclared identifier 'wlr_presentation_surface_sampled_on_output'; did you mean 'wlr_presentation_surface_textured_on_output'? + wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, PSURFACE, pMonitor->output); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --- src/Compositor.cpp.orig 2023-07-11 02:50:09 UTC +++ src/Compositor.cpp @@ -458,7 +458,7 @@ void CCompositor::startCompositor() { @@ -109,7 +118,25 @@ Apply https://github.com/swaywm/sway/commit/6f1a3b6652b9 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() { +@@ -57,7 +57,7 @@ void renderSurface(struct wlr_surface* surface, int x, + + if (!g_pHyprRenderer->m_bBlockSurfaceFeedback) { + wlr_surface_send_frame_done(surface, RDATA->when); +- wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, surface, RDATA->pMonitor->output); ++ wlr_presentation_surface_scanned_out_on_output(g_pCompositor->m_sWLRPresentation, surface, RDATA->pMonitor->output); + } + + // reset the UV, we might've set it above +@@ -777,7 +777,7 @@ bool CHyprRenderer::attemptDirectScanout(CMonitor* pMo + timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + wlr_surface_send_frame_done(PSURFACE, &now); +- wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, PSURFACE, pMonitor->output); ++ wlr_presentation_surface_scanned_out_on_output(g_pCompositor->m_sWLRPresentation, PSURFACE, pMonitor->output); + + if (wlr_output_commit(pMonitor->output)) { + if (!m_pLastScanout) { +@@ -1916,7 +1916,7 @@ void CHyprRenderer::ensureCursorRenderingMode() { m_bHasARenderedCursor = true; if (!m_bWindowRequestedCursorHide) diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 3052c4af8a1e..e6cb29228c56 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sway -DISTVERSION?= 1.8.1-169 # git rev-list --count 1.8.1..b -DISTVERSIONSUFFIX?= -g6c234d013 +DISTVERSION?= 1.8.1-170 # git rev-list --count 1.8.1.. +DISTVERSIONSUFFIX?= -g910790796 CATEGORIES= x11-wm wayland PKGNAMESUFFIX?= -devel @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols \ - wlroots>=0.16.0.556<0.17.0:x11-toolkits/wlroots + wlroots>=0.16.0.654<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo index d5e1fda7e878..3fe470885804 100644 --- a/x11-wm/sway-devel/distinfo +++ b/x11-wm/sway-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1689280066 -SHA256 (swaywm-sway-1.8.1-169-g6c234d013_GH0.tar.gz) = f24360c8c5bab252567dbcaed2c6957c60a3108297dee05741a2723bcaf95d0c -SIZE (swaywm-sway-1.8.1-169-g6c234d013_GH0.tar.gz) = 5584615 +TIMESTAMP = 1689427295 +SHA256 (swaywm-sway-1.8.1-170-g910790796_GH0.tar.gz) = 5f381dded377cbe4086ec198c448ebd2b8bfa8633eb53c001c611938cbba65d9 +SIZE (swaywm-sway-1.8.1-170-g910790796_GH0.tar.gz) = 5584594 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307161124.36GBOKdx065883>