From patchwork Thu May 13 16:33:20 2021 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: 1478118 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=lyfLL99f; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy0T5jTDz9sW7 for ; Fri, 14 May 2021 02:34:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6C7CA6061C; Thu, 13 May 2021 16:33:59 +0000 (UTC) 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 lSzNQIQuXDdm; Thu, 13 May 2021 16:33:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 7814360655; Thu, 13 May 2021 16:33:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8895C1BF403 for ; Thu, 13 May 2021 16:33:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 76E3E40F0C for ; Thu, 13 May 2021 16:33:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 O5Lv2I-W9VWo for ; Thu, 13 May 2021 16:33:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp4.osuosl.org (Postfix) with ESMTPS id ACA64406A9 for ; Thu, 13 May 2021 16:33:42 +0000 (UTC) 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; bh=rhw40J4t/qsyM6Ql0bcQuspco8aF4YN7OmOYRqrXHyk=; b=lyfLL99fiWXdmsS3M96ENrS9SsEonzHz/gm3MoH6Fq626H5393GiVBbKnXxKh+SWkXwfp9MsxUbpWbzOmsQq08H3ZLY4lGTgUcEu+jkp3Iqm1/CndyN4tAzC3Rg/YbhGc91UjePuEYSIaol9P2NZuOBs9eh9mKs4OlSgINCfJvBe9izRZ7NVDZnTCL968rpFjE1MdXs9sJn4hpQjX/Yhgm8+fAiMge0HekB+AQX0+XMmrcFp9/k4TAi03t7pUZQB4FB8BNM/Q5Rg4LP2NS/BOWNVRBKJeRIJw7HKagpVE8rzVM9oNen5+eQZe2SDABKlz5bY9gn9oa5GtUnRftZMug==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHM-0005Mw-Pi; Thu, 13 May 2021 18:33:40 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 6b7504f5; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:20 +0300 Message-Id: <20210513163325.1775639-2-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0 X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update wayland to version 1.19.0, which mostly includes bug fixes and is the minimum version required by wlroots 0.13.0 Patch "0001-build-add-option-to-disable-tests.patch" is updated to apply cleanly on top of the new release. Patch "0002-meson-do-not-check-for-c.patch" is replaced by a newer one, "0002-meson-only-require-cpp-for-tests.patch" which was accepted by upstream as an improved version of it. Signed-off-by: Adrian Perez de Castro --- ...01-build-add-option-to-disable-tests.patch | 25 ++++---- .../0002-meson-do-not-check-for-c.patch | 29 ---------- ...002-meson-only-require-cpp-for-tests.patch | 57 +++++++++++++++++++ package/wayland/wayland.hash | 8 +-- package/wayland/wayland.mk | 2 +- 5 files changed, 74 insertions(+), 47 deletions(-) delete mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch create mode 100644 package/wayland/0002-meson-only-require-cpp-for-tests.patch diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch index 6ab695e909..7b1fbeb871 100644 --- a/package/wayland/0001-build-add-option-to-disable-tests.patch +++ b/package/wayland/0001-build-add-option-to-disable-tests.patch @@ -1,4 +1,4 @@ -From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001 +From 4bbac166f50e962d2c79f9824db4af3174f69f43 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 3 Mar 2020 15:27:51 -0700 Subject: [PATCH] build: add option to disable tests @@ -15,6 +15,7 @@ Signed-off-by: Alexey Brodkin Signed-off-by: James Hilliard [Upstream status: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] +Signed-off-by: Adrian Perez de Castro --- Makefile.am | 2 ++ configure.ac | 9 +++++++++ @@ -23,7 +24,7 @@ https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index cc87392..d5d43e3 100644 +index b9438b7..6e188de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc @@ -43,7 +44,7 @@ index cc87392..d5d43e3 100644 EXTRA_DIST += tests/scanner-test.sh \ protocol/tests.xml \ diff --git a/configure.ac b/configure.ac -index dda5e48..99b7c96 100644 +index 7f2f393..cdff720 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries], @@ -70,10 +71,10 @@ index dda5e48..99b7c96 100644 [ ICONDIR=$withval], [ ICONDIR=${datadir}/icons]) diff --git a/meson.build b/meson.build -index 5632f4e..b37bb7a 100644 +index 11c35fa..26d69ad 100644 --- a/meson.build +++ b/meson.build -@@ -83,7 +83,9 @@ subdir('src') +@@ -91,7 +91,9 @@ subdir('src') if get_option('libraries') subdir('cursor') subdir('egl') @@ -81,15 +82,15 @@ index 5632f4e..b37bb7a 100644 + if get_option('tests') + subdir('tests') + endif - endif - - if get_option('documentation') + if get_option('documentation') + subdir('doc') + endif diff --git a/meson_options.txt b/meson_options.txt -index 76314f7..ab4be92 100644 +index de588d1..4433fa0 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,6 +2,10 @@ option('libraries', - description: 'Compile Wayland libraries', +@@ -6,6 +6,10 @@ option('scanner', + description: 'Compile wayland-scanner binary', type: 'boolean', value: 'true') +option('tests', @@ -100,5 +101,5 @@ index 76314f7..ab4be92 100644 description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', type: 'boolean', -- -2.20.1 +2.31.1 diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch deleted file mode 100644 index c5819bf477..0000000000 --- a/package/wayland/0002-meson-do-not-check-for-c.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Wed, 29 Jul 2020 08:20:41 +0200 -Subject: [PATCH] meson: do not check for c++ - -Wayland does not need c++, fixes building with toolchains lacking c++. - -Backported from upstream PR: -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88 - -Signed-off-by: Bernd Kuhls ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index b67b101..e47a52d 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project( -- 'wayland', 'c', 'cpp', -+ 'wayland', 'c', - version: '1.18.0', - license: 'MIT', - meson_version: '>= 0.47.0', --- -2.27.0 - diff --git a/package/wayland/0002-meson-only-require-cpp-for-tests.patch b/package/wayland/0002-meson-only-require-cpp-for-tests.patch new file mode 100644 index 0000000000..bc1af23f22 --- /dev/null +++ b/package/wayland/0002-meson-only-require-cpp-for-tests.patch @@ -0,0 +1,57 @@ +From 7672edbd84313d536a8ff4aa8a6855fcb46ce378 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 16 Apr 2021 02:32:38 -0600 +Subject: [PATCH] meson: only require cpp for tests + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130] +Signed-off-by: Adrian Perez de Castro +--- + meson.build | 2 +- + tests/meson.build | 16 +++++++++------- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/meson.build b/meson.build +index 26d69ad..2c96d20 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project( +- 'wayland', 'c', 'cpp', ++ 'wayland', 'c', + version: '1.19.0', + license: 'MIT', + meson_version: '>= 0.52.1', +diff --git a/tests/meson.build b/tests/meson.build +index a32ac50..2e11af4 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -64,15 +64,17 @@ executable( + dependencies: test_runner_dep + ) + +-test( +- 'cpp-compile-test', +- executable( ++if add_languages('cpp') ++ test( + 'cpp-compile-test', +- 'cpp-compile-test.cpp', +- wayland_server_protocol_h, +- include_directories: src_inc ++ executable( ++ 'cpp-compile-test', ++ 'cpp-compile-test.cpp', ++ wayland_server_protocol_h, ++ include_directories: src_inc ++ ) + ) +-) ++endif + + sed_path = find_program('sed').path() + +-- +2.31.1 + diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index abd8bcdf29..e9dcb63a90 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html -md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz -sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz -sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz -sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html +sha256 baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 wayland-1.19.0.tar.xz +sha512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef wayland-1.19.0.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 6cb4a50dbb..ecfe95d68a 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.18.0 +WAYLAND_VERSION = 1.19.0 WAYLAND_SITE = https://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT From patchwork Thu May 13 16:33:21 2021 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: 1478119 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=jciHQu29; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy0k4cGSz9sW7 for ; Fri, 14 May 2021 02:34:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 00B2E60A5F; Thu, 13 May 2021 16:34:12 +0000 (UTC) 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 6hHAb-d9M_wt; Thu, 13 May 2021 16:34:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3B33F60655; Thu, 13 May 2021 16:34:10 +0000 (UTC) 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 6DD941BF403 for ; Thu, 13 May 2021 16:33:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5CEF9843A4 for ; Thu, 13 May 2021 16:33:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 q4TkTKD2mWmD for ; Thu, 13 May 2021 16:33:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp1.osuosl.org (Postfix) with ESMTPS id 52CDD84391 for ; Thu, 13 May 2021 16:33:47 +0000 (UTC) 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; bh=rpFxctCUxhoKX7FJPf+TtXmoe72OlLUu9dTtphnzVbY=; b=jciHQu29t7FKgdtmD7cl+MVzeXimEfiL82ID0IMtl+r+P0wA8cx7xXuSvxbgs5C+KRj6Ab+FJs8UO6YVjAX17ulOI5kOt7QFQwr68NhJo4S9GCCjvaEok/V9SnPzLCoG+YOqjQiakqbKmYcLPQMBLHVjfBcU3zwi1sb9sO7uspIPDgKSebhYkjIpxvrfKljs/5vPOwZatfPzQxD2z9RYt5LzUxVVtVEUBVIIV4WIWmwr4YR2/VDwVXmJFbua/2oD6gY3wn9Q7ZXU+USGomrVdj2ByVoP2kvtG/KD2v2hZZ8D7OKXE7CbxajbNu8tKJLEG/Dd4FnBR1f/u3Ptez3nxA==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHP-0005Od-KK; Thu, 13 May 2021 18:33:43 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id d840c926; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:21 +0300 Message-Id: <20210513163325.1775639-3-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0 X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update wlroots to version 0.13.0. This is a release which changes API/ABI, applications which use wlroots need to be rebuilt. Currently in Buildroot there is only cage, to be updated by a follow-up patch of the series. Additionally, remove usage of the xcb-icccm build option, which is no longer available. Signed-off-by: Adrian Perez de Castro --- package/wlroots/wlroots.hash | 4 ++-- package/wlroots/wlroots.mk | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 2fab9b30b4..024ea93cae 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.12.0/wlroots-0.12.0.tar.gz.sig -sha256 c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb wlroots-0.12.0.tar.gz +# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.13.0/wlroots-0.13.0.tar.gz.sig +sha256 f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 wlroots-0.13.0.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 0160b1aedb..95fadfef5e 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.12.0 +WLROOTS_VERSION = 0.13.0 WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -53,11 +53,4 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_XCB_UTIL_WM),y) -WLROOTS_CONF_OPTS += -Dxcb-icccm=enabled -WLROOTS_DEPENDENCIES += xcb-util-wm -else -WLROOTS_CONF_OPTS += -Dxcb-icccm=disabled -endif - $(eval $(meson-package)) From patchwork Thu May 13 16:33:22 2021 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: 1478120 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=jM/mJJb1; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy0z00R9z9sWH for ; Fri, 14 May 2021 02:34:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CED1F608F5; Thu, 13 May 2021 16:34:24 +0000 (UTC) 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 QXXXNP3PupY9; Thu, 13 May 2021 16:34:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id DB86A60AB2; Thu, 13 May 2021 16:34:22 +0000 (UTC) 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 2FF5B1BF403 for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1F61084391 for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 z9E3A51E8KVJ for ; Thu, 13 May 2021 16:33:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5C5748437C for ; Thu, 13 May 2021 16:33:46 +0000 (UTC) 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; bh=zpFgT0OplIsOxcYeAdSsLRwLzhxoJLbNWizCVF1xhdM=; b=jM/mJJb1QUrYKWMLQ+mlKrcnhlcJsDxq7/94ldz7fyq9BoRlACQeZboq4MPqD4GO1x5G2D44Bnji1Sr6rW4SWFP4qr/0HMGuW/QYdh1KoB3WDWX0CpPTabkdfRyBPIxNB9N91HC9vxqono07+4koTy8X4dPxM/5Jm3FugufauaUercHP21BCvLsYwFq+3gLDQfwq6dkgY6fHoF/9QquirGkCsxwBlXXxSyjIOS8BqirRFKy5zdlaCXgu20VclhyY3WbdzDnzUvo+kJ+IlxrRomxbOR9yA+JsBj/JbkS9KP/USHxfBmIqixgjgjPOXKcNgWuAmazvixouLdeJB7wjGQ==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHQ-0005Mw-H6; Thu, 13 May 2021 18:33:44 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id ddc79e7a; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:22 +0300 Message-Id: <20210513163325.1775639-4-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/6] package/seatd: new package X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Introduce a seatd package, which can be used by wlroots 0.12.0 and newer. The package includes both a library (always built) and an optional seat management daemon. The library can use systemd-logind, the seatd daemon, or a simple builtin in-process mode. Build options are introduced for each of them. At least one backend needs to be built; if both logind and seatd are disabled the builtin backend will be enabled unconditionally. Signed-off-by: Adrian Perez de Castro --- package/Config.in | 1 + ...pport-building-builtin-without-seatd.patch | 37 ++++++++++++++ package/seatd/Config.in | 48 +++++++++++++++++++ package/seatd/seatd.hash | 5 ++ package/seatd/seatd.mk | 42 ++++++++++++++++ 5 files changed, 133 insertions(+) create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch create mode 100644 package/seatd/Config.in create mode 100644 package/seatd/seatd.hash create mode 100644 package/seatd/seatd.mk diff --git a/package/Config.in b/package/Config.in index 82b28d2835..d572d441f0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2489,6 +2489,7 @@ menu "System tools" source "package/scrub/Config.in" source "package/scrypt/Config.in" source "package/sdbusplus/Config.in" + source "package/seatd/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch b/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch new file mode 100644 index 0000000000..fcaa355dc4 --- /dev/null +++ b/package/seatd/0001-meson-Support-building-builtin-without-seatd.patch @@ -0,0 +1,37 @@ +From 11bf7d5d11424749d549239540e5db06b8754bb5 Mon Sep 17 00:00:00 2001 +From: Kenny Levinsen +Date: Sun, 25 Apr 2021 20:16:19 +0200 +Subject: [PATCH] meson: Support building builtin without seatd + +The builtin backend relies on the seatd backend implementation. When +builtin was enabled without seatd, compilation would fail due to the +implementation not being included. + +Include the implementation if either seatd or builtin is enabled. + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: backport [with adaptations] +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index ff56845..8cb4fc6 100644 +--- a/meson.build ++++ b/meson.build +@@ -105,8 +105,11 @@ server_files = [ + 'seatd/server.c', + ] + +-if get_option('seatd').enabled() ++if get_option('seatd').enabled() or get_option('builtin').enabled() + private_files += 'libseat/backend/seatd.c' ++endif ++ ++if get_option('seatd').enabled() + add_project_arguments('-DSEATD_ENABLED=1', language: 'c') + endif + +-- +2.31.1 + diff --git a/package/seatd/Config.in b/package/seatd/Config.in new file mode 100644 index 0000000000..a921e0e01c --- /dev/null +++ b/package/seatd/Config.in @@ -0,0 +1,48 @@ +menuconfig BR2_PACKAGE_SEATD + bool "seatd" + select BR2_PACKAGE_SEATD_LIBSEAT + help + Seat management daemon and support library. + + https://git.sr.ht/~kennylevinsen/seatd + +if BR2_PACKAGE_SEATD + +config BR2_PACKAGE_SEATD_LIBSEAT + bool "libseat" + select BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN \ + if !BR2_PACKAGE_SEATD_LIBSEAT_LOGIND && !BR2_PACKAGE_SEATD_LIBSEAT_SEATD + +if BR2_PACKAGE_SEATD_LIBSEAT + +config BR2_PACKAGE_SEATD_LIBSEAT_LOGIND + bool "logind backend" + default y + depends on BR2_PACKAGE_SYSTEMD_LOGIND + help + Support using logind for seat management. + +comment "logind backend needs systemd-logind" + depends on !BR2_PACKAGE_SYSTEMD_LOGIND + +config BR2_PACKAGE_SEATD_LIBSEAT_SEATD + bool "seatd backend" + default y + depends on BR2_PACKAGE_SEATD_SEATD + help + Support using seatd for seat management. + +comment "seatd backend needs seatd daemon" + depends on !BR2_PACKAGE_SEATD_SEATD + +config BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN + bool "builtin backend" + help + Builtin in-process seatd implementation. + +endif + +config BR2_PACKAGE_SEATD_SEATD + bool "seatd daemon" + +endif diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash new file mode 100644 index 0000000000..342079e958 --- /dev/null +++ b/package/seatd/seatd.hash @@ -0,0 +1,5 @@ +# Calculated locally +sha256 274b56324fc81ca6002bc1cdd387668dee34a6e1063e5f3896805c3770948988 0.5.0.tar.gz + +# License files +sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk new file mode 100644 index 0000000000..45da53904f --- /dev/null +++ b/package/seatd/seatd.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# seatd +# +################################################################################ + +SEATD_VERSION = 0.5.0 +SEATD_SOURCE = $(SEATD_VERSION).tar.gz +SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive +SEATD_LICENSE = MIT +SEATD_LICENSE_FILES = LICENSE +SEATD_INSTALL_STAGING = YES + +SEATD_CONF_OPTS += \ + -Dman-pages=disabled \ + -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT_LOGIND),y) +SEATD_CONF_OPTS += -Dlogind=enabled +else +SEATD_CONF_OPTS += -Dlogind=disabled +endif + +ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT_SEATD),y) +SEATD_CONF_OPTS += -Dseatd=enabled +else +SEATD_CONF_OPTS += -Dseatd=disabled +endif + +ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN),y) +SEATD_CONF_OPTS += -Dbuiltin=enabled +else +SEATD_CONF_OPTS += -Dbuiltin=disabled +endif + +ifeq ($(BR2_PACKAGE_SEATD_SEATD),y) +SEATD_CONF_OPTS += -Dserver=enabled +else +SEATD_CONF_OPTS += -Dserver=disabled +endif + +$(eval $(meson-package)) From patchwork Thu May 13 16:33:23 2021 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: 1478121 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=E24naSrK; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy1B6hjsz9sW7 for ; Fri, 14 May 2021 02:34:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5A21C40003; Thu, 13 May 2021 16:34:37 +0000 (UTC) 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 vTNLaVZ6dPOA; Thu, 13 May 2021 16:34:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id A7C84403E0; Thu, 13 May 2021 16:34:35 +0000 (UTC) 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 1EE731BF403 for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0E1DE84391 for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 tZMWPBIV7bSc for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp1.osuosl.org (Postfix) with ESMTPS id 474018437C for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) 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; bh=5hQ/jJRFBMwN1jpIOd5R10fehTYinoKH3t4eKjJfdF0=; b=E24naSrKOiSjM8BzgnuqG6hCCdj+lMavwBoRrWkze+vO0XuyXA29tz7vWPkIZ68nkvF1EbKXBOXp+keWuuh2CJMo+TEqJyd140DBHcB2Q/NL38z6xM3FGQQsbwQAtkDbnvDu9VY6IfHodtJKE3zQdXwqlHJvXXvlys7QvPddTSL9sC+2n+iR4gPZzUK0hdmxj1ejhmmL/FRkBPEvn1fhojnNT/MglkH4TfmZ4Ba5rJn+t3wIEO3WX3+sutt/zC7tDXLjACLzT2caM1Qg1yrQ99UvOCY/0qzzsqQGMm7qtObXjP+ADUWOp09c1TH8C44EtGQbBXZ7nlIdgr+7EbC9EQ==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHT-0005Od-Cu; Thu, 13 May 2021 18:33:47 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id c1de4c91; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:23 +0300 Message-Id: <20210513163325.1775639-5-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/6] package/seatd: install init scripts X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add commands to the seatd package to install the systemd unit included in the source tarball and a SysV init script. Signed-off-by: Adrian Perez de Castro --- package/seatd/S70seatd | 38 ++++++++++++++++++++++++++++++++++++++ package/seatd/seatd.mk | 10 ++++++++++ 2 files changed, 48 insertions(+) create mode 100755 package/seatd/S70seatd diff --git a/package/seatd/S70seatd b/package/seatd/S70seatd new file mode 100755 index 0000000000..a91302c6c1 --- /dev/null +++ b/package/seatd/S70seatd @@ -0,0 +1,38 @@ +#! /bin/sh +# +# Starts seatd +# + +DAEMON=/usr/bin/seatd +PIDFILE=/run/seatd.pid + +case "$1" in + start) + printf 'Starting seatd: ' + if start-stop-daemon -S -x "$DAEMON" -p "$PIDFILE" -m -b -- -g video + then + echo OK + else + echo FAIL + fi + ;; + stop) + if start-stop-daemon -K -x "$DAEMON" -p "$PIDFILE" + then + echo OK + else + echo FAIL + fi + ;; + restart) + "$0" stop || true + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 45da53904f..abb7cb888f 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -39,4 +39,14 @@ else SEATD_CONF_OPTS += -Dserver=disabled endif +define SEATD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D $(SEATD_PKGDIR)/S70seatd \ + $(TARGET_DIR)/etc/init.d/S70seatd +endef + +define SEATD_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0644 -D $(@D)/contrib/systemd/seatd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/seatd.service +endef + $(eval $(meson-package)) From patchwork Thu May 13 16:33:24 2021 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: 1478123 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=OVAkAT6k; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy1j1mmJz9sW7 for ; Fri, 14 May 2021 02:35:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BE6658450F; Thu, 13 May 2021 16:35:02 +0000 (UTC) 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 ZChIR1LXJkgc; Thu, 13 May 2021 16:35:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id CB6AD84490; Thu, 13 May 2021 16:35:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 19BAB1BF403 for ; Thu, 13 May 2021 16:33:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 167694037E for ; Thu, 13 May 2021 16:33:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 IuPTqPYHkuWg for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp4.osuosl.org (Postfix) with ESMTPS id 423804038C for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) 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; bh=mYSnOM6Zyp/WWqkcvQU8ovrLNfx2IdsYZIf7Cirs/iM=; b=OVAkAT6kCZRphULIh60o2eRyZYT5WN4NcVuhwwPzjqrVlk7jyGTbYrB3qVNRWx/Yi+0PsftWp3AO4giDSkvauAygopYw2gF4Xy3eIkZ7Xd6RVwj5fY7JKLydsEjVrbmtdMVu44dJpkp8LVt+h23R8TsaWjj3WglPjocvgIYfQ21KBnl8ZsOSjrNe91IISZ+mKi3ie2YZLDpIn8w9SKDg6GRSA+ZIuuHMq1RbiZCMFBcP+N/3hxmXKct++DjWkp4nJZuwtTWcBQUfaBVL4io3Ocafm/u5H64SwEKOzFpdnWx4Sk9RtZlUgRCYVkWg6Q2cX2lVfRXKCiDGW4ArgQKbFQ==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHU-0005Mw-8D; Thu, 13 May 2021 18:33:48 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 2d2b246c; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:24 +0300 Message-Id: <20210513163325.1775639-6-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/6] package/wlroots: use libseat when available X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Enable using libseat for seat management when possible. Signed-off-by: Adrian Perez de Castro --- package/wlroots/wlroots.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 95fadfef5e..f6ad8f9181 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -22,7 +22,7 @@ WLROOTS_DEPENDENCIES = \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Dlibseat=disabled +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled ifeq ($(BR2_PACKAGE_FFMPEG),y) WLROOTS_DEPENDENCIES += ffmpeg @@ -53,4 +53,11 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif +ifeq ($(BR2_PACKAGE_SEATD_LIBSEAT),y) +WLROOTS_CONF_OPTS += -Dlibseat=enabled +WLROOTS_DEPENDENCIES += seatd +else +WLROOTS_CONF_OPTS += -Dlibseat=disabled +endif + $(eval $(meson-package)) From patchwork Thu May 13 16:33:25 2021 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: 1478122 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=Gl75Q/TN; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgy1R3q3jz9sW7 for ; Fri, 14 May 2021 02:34:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E3A8C83E21; Thu, 13 May 2021 16:34:49 +0000 (UTC) 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 u8CQvVd6UgCA; Thu, 13 May 2021 16:34:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 45BCD83C95; Thu, 13 May 2021 16:34:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C00261BF403 for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id ACD73403BD for ; Thu, 13 May 2021 16:33:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com 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 zLx-QTF3T3TU for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp4.osuosl.org (Postfix) with ESMTPS id A4AC94037E for ; Thu, 13 May 2021 16:33:50 +0000 (UTC) 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; bh=CSCdpN+iQHTJMKRZ2w4REx4//qTfd8AkazaboeSgkV4=; b=Gl75Q/TNwm75DrPJjEJJB3DokYM9Nmh+YhGnsIG7XsUrkrF8y+E/4D/0zEozap6NZkJnwjdDNHX1KyyU8njDTwk+b1qaLYcoCmy40Ei4eoGa2gaysCq7hQ0JETz5Dk6hnIee/T8OmMcqTYM+T9n/Hem17bMAnOL67MY6Fmh5laP4DkYbjeCZKCopiYZkvjQIdMrvaaUkLoStDXp0sjV8PLiHJuCNlF1YFi+f44eXK04LIwDCliSvgDel4FsAtYQn1jhLQczW3ZyezJ749yk2pi09ng0GdfnJtGqNEkVBfzoBocBrOZoOVlHWQWAK2t57sZ1jz3z4y8OphUSVsHUIDA==; Received: from 91-153-34-142.elisa-laajakaista.fi ([91.153.34.142] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lhEHU-0005Pi-QS; Thu, 13 May 2021 18:33:48 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 1e1c334c; Thu, 13 May 2021 16:33:25 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 May 2021 19:33:25 +0300 Message-Id: <20210513163325.1775639-7-aperez@igalia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513163325.1775639-1-aperez@igalia.com> References: <20210513163325.1775639-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/6] package/cage: bump to version 0.1.3 X-BeenThere: buildroot@busybox.net 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 , Eric Le Bihan , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update to version 0.1.3, which is a matenance release which does not add any new features but can be built against wlroots 0.13.0. A new build option to toggle man pages is set to always disabled. Signed-off-by: Adrian Perez de Castro --- package/cage/cage.hash | 2 +- package/cage/cage.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/cage/cage.hash b/package/cage/cage.hash index 5cae952d72..6e312bbf5f 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -1,5 +1,5 @@ # Generated locally -sha256 38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac cage-0.1.2.1.tar.gz +sha256 c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e cage-0.1.3.tar.gz # Hashes for license files: sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 9fc01d36c1..0950c70474 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -4,16 +4,17 @@ # ################################################################################ -CAGE_VERSION = 0.1.2.1 +CAGE_VERSION = 0.1.3 CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION) CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots +CAGE_CONF_OPTS = -Dman-pages=disabled ifeq ($(BR2_PACKAGE_XORG7),y) -CAGE_CONF_OPTS = -Dxwayland=true +CAGE_CONF_OPTS += -Dxwayland=true else -CAGE_CONF_OPTS = -Dxwayland=false +CAGE_CONF_OPTS += -Dxwayland=false endif $(eval $(meson-package))