From nobody Sun Jul 16 11:25:27 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R3jZ01sGgz4mv29; Sun, 16 Jul 2023 11:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R3jZ00vZ6z4GlW; Sun, 16 Jul 2023 11:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689506728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A3Z1POm3ELC8TXhN+YFeNlJFRVsQPkq/J6ZeRW3Cpv4=; b=H8ArTQY2RWa2Cd/vyBn6rwbcncTf9l76CQr9kFeJEumb6B5+mIMjbeCxceuhNKBRT1g9mV G/lejWPCvfRq2k7FcVdDBA/l4kCCBtZ3L50CxHt6th24CE81NjILQgn1HTopS1rjpqe7iw WOkGSQ+oG3FOgbr8DGhlPO5UdUBtM9A+E34A1fI6+QXihWObOhmG2iofhV+BhHgbrYgk7T r0Ii5GVxiASHhWFO7wnPqjBB8xttkUvpAz7935q2mlPKe+uEGByx8pitAd4wXE+NbMBqwt FeMFE8aE+XE2X35PUUQAqlrLawQVNeHwBgSDJg2b2rLuTUisAzeNVCxyR17Npw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689506728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A3Z1POm3ELC8TXhN+YFeNlJFRVsQPkq/J6ZeRW3Cpv4=; b=m3peV/Tkk8xGUCjR+gNBeVUMtrgFSsMehJ0ROEWbYfq/OIjD/+tUZKek/VgRjWZJJW4glx Gl008cVhPD8zhUC0giLcnGurMdtDvnjWX0P73HWtB5gbri2jSZrHshtRbs4GPdqR3m2Ln4 D7GXYmjXZRR7k4/Jw0IaHfyrckLPzp7fzsH0fQD1nmSZEa7NGZGRrS27pcBHwcPQNFud04 v099EOaoLCwYEeP5Df1ii9P6pfd90INnKuBID1Zj/bNJiaZQlrzlyXOYMVkSBsZ67Oj7ET ga44OvOmxN00DDumtxU5TLKn8lt4Sh/SoIxdpcOHKVGSy4hGJ5kWI7Nak3MOmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689506728; a=rsa-sha256; cv=none; b=XFSwjw7N4ziRUETP6ab5wVJf796fG7KpUC7gqJEx59cOHNmWAgkWbGNqPUwD9ZJPGfXHo7 UEyfmMQq0OvP4RCmgJycQLbEB9vxRt1xyllq/lGVZkfSVotLRQ1HgXauDGa9mkvP96GBkM yc1k1Pz5aY6fqBagJLnhGY0241BjnpI7n5cetrb4YPH6V+oDuGh2SdZiB58sJWVOEuDkwG ewUdWG8AqxI5vpMcDvtIau1/8ru1rIn0ssq/8U+S6UyzaTCxhX/XVL20O+xs6WSmjMuDcP 8jN8/TJJDAsrUGu7xEbPasRmQFuo0jqDG3ur25e2QIbKfkT8ho0ZLyGvp7JgUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R3jYz75HlzgC7; Sun, 16 Jul 2023 11:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GBPRv2066601; Sun, 16 Jul 2023 11:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GBPRWb066600; Sun, 16 Jul 2023 11:25:27 GMT (envelope-from git) Date: Sun, 16 Jul 2023 11:25:27 GMT Message-Id: <202307161125.36GBPRWb066600@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c9a7e0c84189 - 2023Q3 - x11-toolkits/wlroots-devel: update to 0.16.0.656 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: c9a7e0c84189477f68e5a5bc7aa9fd4154b0f323 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9a7e0c84189477f68e5a5bc7aa9fd4154b0f323 commit c9a7e0c84189477f68e5a5bc7aa9fd4154b0f323 Author: Jan Beich AuthorDate: 2023-07-16 09:55:09 +0000 Commit: Jan Beich CommitDate: 2023-07-16 11:25:16 +0000 x11-toolkits/wlroots-devel: update to 0.16.0.656 Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/88942d43fd...b18c76642a (cherry picked from commit 27b50932c7ab099f48afb53ce3ea2d8facac1caa) --- 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 e47b389eaaec..89c2f86f9d45 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wlroots -DISTVERSION= 0.16.0-651 +DISTVERSION= 0.16.0-656 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= 88942d43fd874292a7a56a90a0452314d99ddff9 +GL_COMMIT= b18c76642ade7df4ac93623a2fee5b0a9e6c6407 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 747d71053ca3..c5f1b599d9d0 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1689339973 -SHA256 (wlroots-wlroots-88942d43fd874292a7a56a90a0452314d99ddff9_GL0.tar.gz) = 03b2801c07790d001c585dcdc813c0b050f5df2d901f8bd7a1bb731ce412560f -SIZE (wlroots-wlroots-88942d43fd874292a7a56a90a0452314d99ddff9_GL0.tar.gz) = 633042 +TIMESTAMP = 1689501309 +SHA256 (wlroots-wlroots-b18c76642ade7df4ac93623a2fee5b0a9e6c6407_GL0.tar.gz) = f43fb188bc5df2eb433be107321f61476a7e56c218519efcbddd75039209a94d +SIZE (wlroots-wlroots-b18c76642ade7df4ac93623a2fee5b0a9e6c6407_GL0.tar.gz) = 633386 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