From patchwork Mon Oct 30 10:11:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1856955 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SJpwB6Z9Cz1yQW for ; Mon, 30 Oct 2023 21:11:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1FB5A4F596; Mon, 30 Oct 2023 10:11:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1FB5A4F596 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o0ImAp3vcRI1; Mon, 30 Oct 2023 10:11:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 225924F4BF; Mon, 30 Oct 2023 10:11:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 225924F4BF X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7E3D31BF955 for ; Mon, 30 Oct 2023 10:11:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 62CE7437FB for ; Mon, 30 Oct 2023 10:11:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 62CE7437FB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dnDdHQ8DIayj for ; Mon, 30 Oct 2023 10:11:22 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp2.osuosl.org (Postfix) with ESMTPS id 3203D4329B for ; Mon, 30 Oct 2023 10:11:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3203D4329B Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qxPEr-00ErHG-Ga; Mon, 30 Oct 2023 11:11:17 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 1c6ca52d; Mon, 30 Oct 2023 10:11:15 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Mon, 30 Oct 2023 12:11:05 +0200 Message-ID: <20231030101115.2214402-2-aperez@igalia.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231030101115.2214402-1-aperez@igalia.com> References: <20231030101115.2214402-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9rMEmlJ/g+xgCzBnxRoVdRCH7Wx55cCcJ3Fa2LBm/wM=; b=C1VdHLlXyREJBemSATKTnRgPxA 9YmJMhkRE1apq7FTN4TMo3IU0upQqKSFiarMYMMD3bXbzT1BjBrtNyG2q3ScO4+7R+CIOrUnrpBIg B3u5lJyrkWv4PH1UU4SUFCyONKVE+EJ7jxDwE4B3JQBi9gG48bIzOsg4Qg7i/Pl3xk52co2anqC4f F3gIst+Eoxbspd6b1FDUWjwtmeAOBxC/6ewnZ/bsb+QvbmJbfKeic2Je54caW5V0xzSkh3ng1waZL lLLExEnje84kPQAw2RRo4UQlbQUBPig8hCS1HTa/CyOqVwV1F8ndUfx/QQK/xrDTzhfqTXIEuvNXV pp6m+jRA==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=C1VdHLlX Subject: [Buildroot] [PATCH 1/3] package/wlroots: bump to version 0.16.2 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , Raphael Pavlidis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Update to version 0.16.2, which brings in support for a few new Wayland protocols, and improved input device and scene graph APIs. Applications which use wlroots might need to be adapted, and at least rebuilt. The only packages in Buildroot which use wlroots at the moment are the Cage and Sway compositors, to be updated in follow-up patches. Signed-off-by: Adrian Perez de Castro --- package/wlroots/wlroots.hash | 4 ++-- package/wlroots/wlroots.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 04bbd65e43..8ab05393b1 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.15.1/downloads/wlroots-0.15.1.tar.gz.sig -sha256 5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 wlroots-0.15.1.tar.gz +# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz.sig +sha256 83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa wlroots-0.16.2.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 5b930a51be..b478e57abb 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.15.1 +WLROOTS_VERSION = 0.16.2 WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE From patchwork Mon Oct 30 10:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1856954 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SJpvx6cJKz1yQW for ; Mon, 30 Oct 2023 21:11:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DF7A54F16D; Mon, 30 Oct 2023 10:11:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DF7A54F16D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fLrVSJ0KEVkn; Mon, 30 Oct 2023 10:11:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 7FADB4F4B1; Mon, 30 Oct 2023 10:11:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7FADB4F4B1 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 70C0D1BF313 for ; Mon, 30 Oct 2023 10:11:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 56FFE7036B for ; Mon, 30 Oct 2023 10:11:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 56FFE7036B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IcNhGeWsNDLd for ; Mon, 30 Oct 2023 10:11:21 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6C7FB70B6A for ; Mon, 30 Oct 2023 10:11:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6C7FB70B6A Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qxPEr-00ErHG-TE; Mon, 30 Oct 2023 11:11:18 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 22a71d12; Mon, 30 Oct 2023 10:11:15 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Mon, 30 Oct 2023 12:11:06 +0200 Message-ID: <20231030101115.2214402-3-aperez@igalia.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231030101115.2214402-1-aperez@igalia.com> References: <20231030101115.2214402-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hVjjhhGktFuE0XZp01/YUgdIp3qFLNmCSZNGGtCll88=; b=hbZIPC0DVr0Jf6l2Xh8dS2sOt7 oCAjnlDm5dXj6r46Z1F30qEJzLA3UKXd6OyQHJrpWzizmTRfXfGHfY/PSVpRSYC3+ztGUKA8k6pr6 BtiYM+cCUjFMFlYSG+jxh+byjfofvl1tuneaq249FMwLUakcsSEwsUO+glnTXyv2XlxuMbMYgoFja EKZ5jN8KZzaYuugqvsD9WZvDmGNo5U1qSPquhMkmxsg4QSfN80pGMTmfMZRNHyVfm6lxCAEegc2e2 xcdbFlh1flwVVjUGKJeyoFCyjbfhYU7ehX2s7SS6UVxCVrQ87S8AVutSzhkY6Xu1xgQZIOTBMiAJM 8ny9qQkA==; X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=hbZIPC0D Subject: [Buildroot] [PATCH 2/3] package/cage: bump to version 0.1.5 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , Raphael Pavlidis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Update Cage to version 0.1.5, which is a bug fix release that supports using wlroots 0.16.x. Signed-off-by: Adrian Perez de Castro --- .../cage/0001-Upgrade-to-wlroots-0.15.patch | 312 ------------------ package/cage/cage.hash | 4 +- package/cage/cage.mk | 2 +- 3 files changed, 3 insertions(+), 315 deletions(-) delete mode 100644 package/cage/0001-Upgrade-to-wlroots-0.15.patch diff --git a/package/cage/0001-Upgrade-to-wlroots-0.15.patch b/package/cage/0001-Upgrade-to-wlroots-0.15.patch deleted file mode 100644 index a5716ede43..0000000000 --- a/package/cage/0001-Upgrade-to-wlroots-0.15.patch +++ /dev/null @@ -1,312 +0,0 @@ -From e51bef3fdad649d453276717294cc6177666cf5a Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Wed, 11 Aug 2021 11:31:14 +0200 -Subject: [PATCH] Upgrade to wlroots 0.15 - -- Update wlr_box includes to util/box.h: the wlroots header has - been moved upstream. -- Subsurface fields have been moved -- Create renderer and allocator, stop using wlr_backend_get_renderer -- Initalize output rendering - -Signed-off-by: Adrian Perez de Castro -Upstream status: https://github.com/Hjdskes/cage/commit/395189fb051ed722c7b10b6cb11caa8f6904079c ---- - cage.c | 21 +++++++++++++++++---- - meson.build | 2 +- - output.c | 5 +++++ - render.c | 26 ++++++++------------------ - server.h | 2 ++ - util.c | 2 -- - util.h | 2 +- - view.c | 5 ++--- - view.h | 2 +- - xdg_shell.c | 1 - - xwayland.c | 1 - - 11 files changed, 37 insertions(+), 32 deletions(-) - -diff --git a/cage.c b/cage.c -index 5392535..f9db7a9 100644 ---- a/cage.c -+++ b/cage.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -261,7 +262,6 @@ main(int argc, char *argv[]) - struct wl_event_source *sigint_source = NULL; - struct wl_event_source *sigterm_source = NULL; - struct wl_event_source *sigchld_source = NULL; -- struct wlr_renderer *renderer = NULL; - struct wlr_compositor *compositor = NULL; - struct wlr_data_device_manager *data_device_manager = NULL; - struct wlr_server_decoration_manager *server_decoration_manager = NULL; -@@ -316,8 +316,21 @@ main(int argc, char *argv[]) - goto end; - } - -- renderer = wlr_backend_get_renderer(server.backend); -- wlr_renderer_init_wl_display(renderer, server.wl_display); -+ server.renderer = wlr_renderer_autocreate(server.backend); -+ if (!server.renderer) { -+ wlr_log(WLR_ERROR, "Unable to create the wlroots renderer"); -+ ret = 1; -+ goto end; -+ } -+ -+ server.allocator = wlr_allocator_autocreate(server.backend, server.renderer); -+ if (!server.allocator) { -+ wlr_log(WLR_ERROR, "Unable to create the wlroots allocator"); -+ ret = 1; -+ goto end; -+ } -+ -+ wlr_renderer_init_wl_display(server.renderer, server.wl_display); - - wl_list_init(&server.views); - wl_list_init(&server.outputs); -@@ -329,7 +342,7 @@ main(int argc, char *argv[]) - goto end; - } - -- compositor = wlr_compositor_create(server.wl_display, renderer); -+ compositor = wlr_compositor_create(server.wl_display, server.renderer); - if (!compositor) { - wlr_log(WLR_ERROR, "Unable to create the wlroots compositor"); - ret = 1; -diff --git a/meson.build b/meson.build -index 3a84794..f2e5428 100644 ---- a/meson.build -+++ b/meson.build -@@ -34,7 +34,7 @@ if is_freebsd - ) - endif - --wlroots = dependency('wlroots', version: '>= 0.14.0') -+wlroots = dependency('wlroots', version: '>= 0.15.0') - wayland_protos = dependency('wayland-protocols', version: '>=1.14') - wayland_server = dependency('wayland-server') - pixman = dependency('pixman-1') -diff --git a/output.c b/output.c -index d8da3b9..e8b3a22 100644 ---- a/output.c -+++ b/output.c -@@ -442,6 +442,11 @@ handle_new_output(struct wl_listener *listener, void *data) - struct cg_server *server = wl_container_of(listener, server, new_output); - struct wlr_output *wlr_output = data; - -+ if (!wlr_output_init_render(wlr_output, server->allocator, server->renderer)) { -+ wlr_log(WLR_ERROR, "Failed to initialize output rendering"); -+ return; -+ } -+ - struct cg_output *output = calloc(1, sizeof(struct cg_output)); - if (!output) { - wlr_log(WLR_ERROR, "Failed to allocate output"); -diff --git a/render.c b/render.c -index 166a088..ffa960f 100644 ---- a/render.c -+++ b/render.c -@@ -10,11 +10,11 @@ - #include - #include - #include --#include - #include - #include - #include - #include -+#include - #include - #include - -@@ -27,8 +27,6 @@ - static void - scissor_output(struct wlr_output *output, pixman_box32_t *rect) - { -- struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend); -- - struct wlr_box box = { - .x = rect->x1, - .y = rect->y1, -@@ -41,7 +39,7 @@ scissor_output(struct wlr_output *output, pixman_box32_t *rect) - enum wl_output_transform transform = wlr_output_transform_invert(output->transform); - wlr_box_transform(&box, &box, transform, output_width, output_height); - -- wlr_renderer_scissor(renderer, &box); -+ wlr_renderer_scissor(output->renderer, &box); - } - - struct render_data { -@@ -52,8 +50,6 @@ static void - render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage, struct wlr_texture *texture, - const struct wlr_box *box, const float matrix[static 9]) - { -- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend); -- - pixman_region32_t damage; - pixman_region32_init(&damage); - pixman_region32_union_rect(&damage, &damage, box->x, box->y, box->width, box->height); -@@ -66,7 +62,7 @@ render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage, - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; i++) { - scissor_output(wlr_output, &rects[i]); -- wlr_render_texture_with_matrix(renderer, texture, matrix, 1.0f); -+ wlr_render_texture_with_matrix(wlr_output->renderer, texture, matrix, 1.0f); - } - - damage_finish: -@@ -134,13 +130,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) - struct cg_server *server = output->server; - struct wlr_output *wlr_output = output->wlr_output; - -- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend); -- if (!renderer) { -- wlr_log(WLR_DEBUG, "Expected the output backend to have a renderer"); -- return; -- } -- -- wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height); -+ wlr_renderer_begin(server->renderer, wlr_output->width, wlr_output->height); - - if (!pixman_region32_not_empty(damage)) { - wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer swap"); -@@ -149,7 +139,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) - - #ifdef DEBUG - if (server->debug_damage_tracking) { -- wlr_renderer_clear(renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f}); -+ wlr_renderer_clear(server->renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f}); - } - #endif - -@@ -158,7 +148,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; i++) { - scissor_output(wlr_output, &rects[i]); -- wlr_renderer_clear(renderer, color); -+ wlr_renderer_clear(server->renderer, color); - } - - // TODO: render only top view, possibly use focused view for this, see #35. -@@ -178,8 +168,8 @@ renderer_end: - /* Draw software cursor in case hardware cursors aren't - available. This is a no-op when they are. */ - wlr_output_render_software_cursors(wlr_output, damage); -- wlr_renderer_scissor(renderer, NULL); -- wlr_renderer_end(renderer); -+ wlr_renderer_scissor(server->renderer, NULL); -+ wlr_renderer_end(server->renderer); - - int output_width, output_height; - wlr_output_transformed_resolution(wlr_output, &output_width, &output_height); -diff --git a/server.h b/server.h -index 817637b..74970c5 100644 ---- a/server.h -+++ b/server.h -@@ -25,6 +25,8 @@ struct cg_server { - struct wl_display *wl_display; - struct wl_list views; - struct wlr_backend *backend; -+ struct wlr_renderer *renderer; -+ struct wlr_allocator *allocator; - - struct cg_seat *seat; - struct wlr_idle *idle; -diff --git a/util.c b/util.c -index 95de499..714c7e3 100644 ---- a/util.c -+++ b/util.c -@@ -6,8 +6,6 @@ - * See the LICENSE file accompanying this file. - */ - --#include -- - #include "util.h" - - int -diff --git a/util.h b/util.h -index db6bc7d..b6281f3 100644 ---- a/util.h -+++ b/util.h -@@ -1,7 +1,7 @@ - #ifndef CG_UTIL_H - #define CG_UTIL_H - --#include -+#include - - /** Apply scale to a width or height. */ - int scale_length(int length, int offset, float scale); -diff --git a/view.c b/view.c -index 3f3b0ed..33b59b4 100644 ---- a/view.c -+++ b/view.c -@@ -12,7 +12,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface) - view->wlr_surface = surface; - - struct wlr_subsurface *subsurface; -- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) { -+ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_below, current.link) { - subsurface_create(view, subsurface); - } -- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) { -+ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_above, current.link) { - subsurface_create(view, subsurface); - } - -diff --git a/view.h b/view.h -index cd16e42..87477d0 100644 ---- a/view.h -+++ b/view.h -@@ -5,9 +5,9 @@ - - #include - #include --#include - #include - #include -+#include - #if CAGE_HAS_XWAYLAND - #include - #endif -diff --git a/xdg_shell.c b/xdg_shell.c -index 2e42347..d676552 100644 ---- a/xdg_shell.c -+++ b/xdg_shell.c -@@ -9,7 +9,6 @@ - #include - #include - #include --#include - #include - #include - -diff --git a/xwayland.c b/xwayland.c -index 2aae0f9..ebd8e54 100644 ---- a/xwayland.c -+++ b/xwayland.c -@@ -9,7 +9,6 @@ - #include - #include - #include --#include - #include - #include - --- -2.36.0 - diff --git a/package/cage/cage.hash b/package/cage/cage.hash index 57a1c12638..d5517bd918 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -1,5 +1,5 @@ -# Generated locally after checking GPG signature -sha256 dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 cage-0.1.4.tar.gz +# Generated locally after checking GPG signature from https://github.com/cage-kiosk/cage/releases/download/v0.1.5/cage-0.1.5.tar.gz.sig +sha256 ece0312e559289df0238289ea6c60e9fed32d27fe3ae8a8f83eeff26ddc239e1 cage-0.1.5.tar.gz # Hashes for license files: sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/package/cage/cage.mk b/package/cage/cage.mk index c132f086f6..119950bc00 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAGE_VERSION = 0.1.4 +CAGE_VERSION = 0.1.5 CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION) CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE From patchwork Mon Oct 30 10:11:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1856956 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SJpwR4xXFz1yQW for ; Mon, 30 Oct 2023 21:12:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DFE744F59A; Mon, 30 Oct 2023 10:12:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DFE744F59A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bz_EzotyUrzc; Mon, 30 Oct 2023 10:12:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 362E24F595; Mon, 30 Oct 2023 10:12:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 362E24F595 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C52DB1BF313 for ; Mon, 30 Oct 2023 10:11:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9E89885520 for ; Mon, 30 Oct 2023 10:11:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9E89885520 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IZuSOpUew7yW for ; Mon, 30 Oct 2023 10:11:23 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp1.osuosl.org (Postfix) with ESMTPS id 88F1185545 for ; Mon, 30 Oct 2023 10:11:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 88F1185545 Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qxPEs-00ErHG-Ay; Mon, 30 Oct 2023 11:11:18 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 3508670d; Mon, 30 Oct 2023 10:11:15 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Mon, 30 Oct 2023 12:11:07 +0200 Message-ID: <20231030101115.2214402-4-aperez@igalia.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231030101115.2214402-1-aperez@igalia.com> References: <20231030101115.2214402-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=6LtwWq266xbtiBT0+J9oyjBs3CSile7p2a12cHaAG+E=; b=HZo0nuD2GkhUuAVTovR7mKSE12 cwHqonpP56gG7AGSPeGLo0zIUHLwjB/6Brkm0B8RzdpTvZnML4kSw7lmy7qRujcAXzU/c2DSVUJ2+ WmyexwRx1kzqI5VaOXChuasbLy4JM4hLdXIa6PA84j+hvcTRok+pISADiD4nuEAPNjLvm770E4Tnu oHOMZWdQ6ps+0uQUQEUTUqWrfIe9kMv5jbi307si72ZR5ZIF2wZgppIOFPVyZ9QLv3Lgvg0yxljl1 jgkuUbHdgXs0n1Wu02xNxUolwBARY0gSZYWQOHeVrRSQw2fbGNMlr217bJGqAFaOwRlEVyo0RyPpW Ikjjc4KQ==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=HZo0nuD2 Subject: [Buildroot] [PATCH 3/3] package/sway: bump to version 1.8.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , Raphael Pavlidis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Update Sway to version 1.8.1, which brings a new release series to Buildroot and can be built with wlroots 0.16.x Signed-off-by: Adrian Perez de Castro --- package/sway/sway.hash | 2 +- package/sway/sway.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sway/sway.hash b/package/sway/sway.hash index 6dfa71730f..86b6581f1c 100644 --- a/package/sway/sway.hash +++ b/package/sway/sway.hash @@ -1,3 +1,3 @@ # Locally computed, tarball verified with GPG signature -sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 73f08fd2cf7948e8af900709efe44eae412ae11c5773960e25c9aa09f73bad41 sway-1.8.1.tar.gz sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 802371c827..19f90b8b00 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -4,8 +4,8 @@ # ################################################################################ -SWAY_VERSION = 1.7 -SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_VERSION = 1.8.1 +SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango