* [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-16 14:04 ` Yann E. MORIN
2021-05-13 16:33 ` [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
` (6 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
...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 <james.hilliard1@gmail.com>
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 <abrodkin@synopsys.com>
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[Upstream status:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
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 <bernd.kuhls@t-online.de>
-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 <bernd.kuhls@t-online.de>
----
- 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 <james.hilliard1@gmail.com>
+Date: Fri, 16 Apr 2021 02:32:38 -0600
+Subject: [PATCH] meson: only require cpp for tests
+
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[Upstream status:
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130]
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+---
+ 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
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0
2021-05-13 16:33 ` [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0 Adrian Perez de Castro
@ 2021-05-16 14:04 ` Yann E. MORIN
2021-05-18 12:13 ` Adrian Perez de Castro
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-16 14:04 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> 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 <aperez@igalia.com>
Applied to next, with the following changes:
- do actual backports of upstream patches now they've been merged
- consequently, drop the legacy autostuff hunks from first patch
Thanks!
Regards,
Yann E. MORIN.
> ---
> ...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 <james.hilliard1@gmail.com>
> 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 <abrodkin@synopsys.com>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> [Upstream status:
> https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> 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 <bernd.kuhls@t-online.de>
> -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 <bernd.kuhls@t-online.de>
> ----
> - 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 <james.hilliard1@gmail.com>
> +Date: Fri, 16 Apr 2021 02:32:38 -0600
> +Subject: [PATCH] meson: only require cpp for tests
> +
> +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> +[Upstream status:
> +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130]
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> +---
> + 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
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0
2021-05-16 14:04 ` Yann E. MORIN
@ 2021-05-18 12:13 ` Adrian Perez de Castro
0 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 12:13 UTC (permalink / raw)
To: buildroot
Hi Yann, all,
On Sun, 16 May 2021 16:04:14 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Adrian, All,
>
> On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> > 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 <aperez@igalia.com>
>
> Applied to next, with the following changes:
>
> - do actual backports of upstream patches now they've been merged
> - consequently, drop the legacy autostuff hunks from first patch
>
> Thanks!
\o/
Given that this went into ?next?, I'll update the patch set and rebase it
on top of ?next? for resubmission :)
Thanks for the review!
-Adrian
> > ---
> > ...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 <james.hilliard1@gmail.com>
> > 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 <abrodkin@synopsys.com>
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > [Upstream status:
> > https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
> > +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> > 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 <bernd.kuhls@t-online.de>
> > -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 <bernd.kuhls@t-online.de>
> > ----
> > - 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 <james.hilliard1@gmail.com>
> > +Date: Fri, 16 Apr 2021 02:32:38 -0600
> > +Subject: [PATCH] meson: only require cpp for tests
> > +
> > +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > +[Upstream status:
> > +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130]
> > +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > +---
> > + 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
> > --
> > 2.31.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/1f3412c5/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
2021-05-13 16:33 ` [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0 Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-16 13:41 ` Yann E. MORIN
2021-05-13 16:33 ` [Buildroot] [PATCH 3/6] package/seatd: new package Adrian Perez de Castro
` (5 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0
2021-05-13 16:33 ` [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
@ 2021-05-16 13:41 ` Yann E. MORIN
2021-05-18 12:22 ` Adrian Perez de Castro
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-16 13:41 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> 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.
Hmm... This one got me to look deeper, and it seems that, even though
the option -Dxcb-icccm is no longer available, the dependency toward
xcb-util-wm is now mandatory for the X11 backend. See upstream commit
565f67f805:
https://github.com/swaywm/wlroots/commit/565f67f805a0d1077e63c16123cea16cee97d3e6
Even more, it seems that BR2_PACKAGE_WLROOTS_X11 should now select a few
additional packages, namely:
BR2_PACKAGE_LIBXCB
BR2_PACKAGE_XCB_UTIL_RENDERUTIL
BR2_PACKAGE_XCB_UTIL_WM
Regards,
Yann E. MORIN.
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> 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))
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0
2021-05-16 13:41 ` Yann E. MORIN
@ 2021-05-18 12:22 ` Adrian Perez de Castro
0 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 12:22 UTC (permalink / raw)
To: buildroot
Hi Yann, all,
On Sun, 16 May 2021 15:41:45 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> > 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.
>
> Hmm... This one got me to look deeper, and it seems that, even though
> the option -Dxcb-icccm is no longer available, the dependency toward
> xcb-util-wm is now mandatory for the X11 backend. See upstream commit
> 565f67f805:
>
> https://github.com/swaywm/wlroots/commit/565f67f805a0d1077e63c16123cea16cee97d3e6
>
> Even more, it seems that BR2_PACKAGE_WLROOTS_X11 should now select a few
> additional packages, namely:
>
> BR2_PACKAGE_LIBXCB
> BR2_PACKAGE_XCB_UTIL_RENDERUTIL
> BR2_PACKAGE_XCB_UTIL_WM
You're absolutely right.
Provided that the X11 backend now will have a few dependencies more, which
are a superset of the ones needed for XWayland, I think it is a good idea
to derive the values for both ?-Dx11-backend=? and ?-Dxwayland=? from
BR2_PACKAGE_WLROOTS_X11?I'll do that for v2 of the patch set.
Cheers,
-Adrian
> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> > 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))
> > --
> > 2.31.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/f95721c7/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/6] package/seatd: new package
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
2021-05-13 16:33 ` [Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0 Adrian Perez de Castro
2021-05-13 16:33 ` [Buildroot] [PATCH 2/6] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-16 13:54 ` Yann E. MORIN
2021-05-13 16:33 ` [Buildroot] [PATCH 4/6] package/seatd: install init scripts Adrian Perez de Castro
` (4 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
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 <kl@kl.wtf>
+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 <aperez@igalia.com>
+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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 3/6] package/seatd: new package
2021-05-13 16:33 ` [Buildroot] [PATCH 3/6] package/seatd: new package Adrian Perez de Castro
@ 2021-05-16 13:54 ` Yann E. MORIN
2021-05-18 13:17 ` Adrian Perez de Castro
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-16 13:54 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> 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 <aperez@igalia.com>
[--SNIP--]
> 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
Why do you need a separate option BR2_PACKAGE_SEATD_LIBSEAT? If the
package is not enabled, that option is not visible; if the package is
enabled, that option is forcibly set... So, I fail to see a reason for
it...
> + bool "libseat"
> + select BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN \
> + if !BR2_PACKAGE_SEATD_LIBSEAT_LOGIND && !BR2_PACKAGE_SEATD_LIBSEAT_SEATD
... and the select it does can be moved to the main symbol without any
issue, AFAICS...
> +if BR2_PACKAGE_SEATD_LIBSEAT
> +
> +config BR2_PACKAGE_SEATD_LIBSEAT_LOGIND
> + bool "logind backend"
> + default y
We usually do not default y, unless there is a very good reason for it.
In this case, I would even drop the option completely, and just enable
the logind support in the makefile:
ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y)
SEATD_CONF_OPTS += -Dlogind=enabled
else
SEATD_CONF_OPTS += -Dlogind=disabled
endif
Also, don't you need a "SEATD_DPENDENCIES += systemd" in that case?
> + 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.
Ditto: I would also drop the option and enable the seatd backend if the
daemon is enabled.
> +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.
And thus, we'd just have this one option, which gets forcibly selected
when neither systemd-logind nor the seatd daemone are enabled;
config BR2_PACKAGE_SEATD
bool "seatd"
select BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN \
if !BR2_PACKAGE_SYSTEMD_LOGIND \
&& !BR2_PACKAGE_SEATD_SEATD
Regards,
Yann E. MORIN.
> +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))
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 3/6] package/seatd: new package
2021-05-16 13:54 ` Yann E. MORIN
@ 2021-05-18 13:17 ` Adrian Perez de Castro
0 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:17 UTC (permalink / raw)
To: buildroot
On Sun, 16 May 2021 15:54:51 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Adrian, All,
>
> On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> > 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 <aperez@igalia.com>
> [--SNIP--]
> > 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
>
> Why do you need a separate option BR2_PACKAGE_SEATD_LIBSEAT? If the
> package is not enabled, that option is not visible; if the package is
> enabled, that option is forcibly set... So, I fail to see a reason for
> it...
As it turns out, right now I cannot remember why it was written this way.
Let's go with the simplification. The auxiliary option can be brought back
when there is some reason for it (if ever).
> > + bool "libseat"
> > + select BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN \
> > + if !BR2_PACKAGE_SEATD_LIBSEAT_LOGIND && !BR2_PACKAGE_SEATD_LIBSEAT_SEATD
>
> ... and the select it does can be moved to the main symbol without any
> issue, AFAICS...
Aye.
> > +if BR2_PACKAGE_SEATD_LIBSEAT
> > +
> > +config BR2_PACKAGE_SEATD_LIBSEAT_LOGIND
> > + bool "logind backend"
> > + default y
>
> We usually do not default y, unless there is a very good reason for it.
> In this case, I would even drop the option completely, and just enable
> the logind support in the makefile:
>
> ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y)
> SEATD_CONF_OPTS += -Dlogind=enabled
> else
> SEATD_CONF_OPTS += -Dlogind=disabled
> endif
Sounds good to me.
> Also, don't you need a "SEATD_DPENDENCIES += systemd" in that case?
Indeed, good catch.
> > + 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.
>
> Ditto: I would also drop the option and enable the seatd backend if the
> daemon is enabled.
Sure.
> > +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.
>
> And thus, we'd just have this one option, which gets forcibly selected
> when neither systemd-logind nor the seatd daemone are enabled;
>
> config BR2_PACKAGE_SEATD
> bool "seatd"
> select BR2_PACKAGE_SEATD_LIBSEAT_BUILTIN \
> if !BR2_PACKAGE_SYSTEMD_LOGIND \
> && !BR2_PACKAGE_SEATD_SEATD
>
> Regards,
> Yann E. MORIN.
>
> > +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))
> > --
> > 2.31.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/9537e543/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 4/6] package/seatd: install init scripts
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
` (2 preceding siblings ...)
2021-05-13 16:33 ` [Buildroot] [PATCH 3/6] package/seatd: new package Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-16 14:00 ` Yann E. MORIN
2021-05-13 16:33 ` [Buildroot] [PATCH 5/6] package/wlroots: use libseat when available Adrian Perez de Castro
` (3 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 4/6] package/seatd: install init scripts
2021-05-13 16:33 ` [Buildroot] [PATCH 4/6] package/seatd: install init scripts Adrian Perez de Castro
@ 2021-05-16 14:00 ` Yann E. MORIN
2021-05-18 13:33 ` Adrian Perez de Castro
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-16 14:00 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> 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 <aperez@igalia.com>
> ---
> 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
I guess this means using the 'video' group, right?
Currently, we do define the video group in the default skeleton, but I
wonder if we should not ensure the group does exist:
define SEATD_USERS
- - video -1 - - - - -
endef
I have no strong feeling about it, though..
Regards,
Yann E. MORIN.
> + 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))
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 4/6] package/seatd: install init scripts
2021-05-16 14:00 ` Yann E. MORIN
@ 2021-05-18 13:33 ` Adrian Perez de Castro
0 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:33 UTC (permalink / raw)
To: buildroot
On Sun, 16 May 2021 16:00:36 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Adrian, All,
>
> On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> > 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 <aperez@igalia.com>
> > ---
> > 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
>
> I guess this means using the 'video' group, right?
Yes, it's the ?video? group.
> Currently, we do define the video group in the default skeleton, but I
> wonder if we should not ensure the group does exist:
>
> define SEATD_USERS
> - - video -1 - - - - -
> endef
>
> I have no strong feeling about it, though..
I was not aware that more than one package can define the same user/group
in FOO_USERS without it being a conflict. I'll add it, because I suppose it
may be good to ensure it will always be created, even if for example someone
is using a custom base skeleton.
> > + 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
Also I just realized that the SEATD_INSTALL_INIT_* definitions should be
done conditionally if the daemon is built. I will keep that in mind :)
Cheers,
-Adrian
> > $(eval $(meson-package))
> > --
> > 2.31.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/355df618/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/6] package/wlroots: use libseat when available
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
` (3 preceding siblings ...)
2021-05-13 16:33 ` [Buildroot] [PATCH 4/6] package/seatd: install init scripts Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-13 16:33 ` [Buildroot] [PATCH 6/6] package/cage: bump to version 0.1.3 Adrian Perez de Castro
` (2 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: buildroot
Enable using libseat for seat management when possible.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 6/6] package/cage: bump to version 0.1.3
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
` (4 preceding siblings ...)
2021-05-13 16:33 ` [Buildroot] [PATCH 5/6] package/wlroots: use libseat when available Adrian Perez de Castro
@ 2021-05-13 16:33 ` Adrian Perez de Castro
2021-05-16 14:07 ` [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Yann E. MORIN
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
7 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-13 16:33 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
` (5 preceding siblings ...)
2021-05-13 16:33 ` [Buildroot] [PATCH 6/6] package/cage: bump to version 0.1.3 Adrian Perez de Castro
@ 2021-05-16 14:07 ` Yann E. MORIN
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
7 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-16 14:07 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> This patch set updates Cage to 0.1.3, which by itself does not have functional
> changes over the previous version, but it pulls in wlroots 0.13.0 which does
> include a good number of improvements. The latter also needs a bump to the
> wayland package, so that gets updated as well.
>
> Last but not least, wlroots can now libseat to broker sessions, so three of
> the patches deal with adding a package for it, installing the daemon init
> scripts (if the daemon is enabled, as it is optional), and arranging for
> wlroots to use libseat when available. I reckon that these three patches
> dealing with libseat could be split in a separate patch set, but I opted
> for including them in the series for context. It looks like libseat is
> gaining momentum in the Wayland ecosystem and for example Weston can also
> use it since half a year ago [1]. At any rate, let me know if you would
> rather have the libseat patches in a separate submission, and I will be
> happy to make it happen :)
No, this is perfectly fine to have in this series. I had a few comments
about patches 2-onward, though, so I marked them changes-requested.
Patch 1 got applied to next. Thanks!
Regards,
Yann E. MORIN.
> Best regards,
> -Adrian
>
>
> [1] https://gitlab.freedesktop.org/wayland/weston/-/commit/6c4a993a999048a2054ec97e71d32839b312c642
>
> Adrian Perez de Castro (6):
> package/wayland: bump to version 1.19.0
> package/wlroots: bump to version 0.13.0
> package/seatd: new package
> package/seatd: install init scripts
> package/wlroots: use libseat when available
> package/cage: bump to version 0.1.3
>
> package/Config.in | 1 +
> package/cage/cage.hash | 2 +-
> package/cage/cage.mk | 7 ++-
> ...pport-building-builtin-without-seatd.patch | 37 ++++++++++++
> package/seatd/Config.in | 48 ++++++++++++++++
> package/seatd/S70seatd | 38 +++++++++++++
> package/seatd/seatd.hash | 5 ++
> package/seatd/seatd.mk | 52 +++++++++++++++++
> ...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 +-
> package/wlroots/wlroots.hash | 4 +-
> package/wlroots/wlroots.mk | 12 ++--
> 15 files changed, 268 insertions(+), 59 deletions(-)
> create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch
> create mode 100644 package/seatd/Config.in
> create mode 100755 package/seatd/S70seatd
> create mode 100644 package/seatd/seatd.hash
> create mode 100644 package/seatd/seatd.mk
> 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
>
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland
2021-05-13 16:33 [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Adrian Perez de Castro
` (6 preceding siblings ...)
2021-05-16 14:07 ` [Buildroot] [PATCH 0/6] Update Cage, wlroots, and wayland Yann E. MORIN
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 1/5] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
` (6 more replies)
7 siblings, 7 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: buildroot
Hello!
This patch set updates Cage to 0.1.3, which by itself does not have functional
changes over the previous version, but it pulls in wlroots 0.13.0 which does
include a good number of improvements.
Last but not least, wlroots can now libseat to broker sessions, so three of
the patches deal with adding a package for it, installing the daemon init
scripts (if the daemon is enabled, as it is optional), and arranging for
wlroots to use libseat when available. It looks like libseat is gaining
momentum in the Wayland ecosystem and for example Weston can also use it
since half a year ago [1].
Best regards,
-Adrian
[1] https://gitlab.freedesktop.org/wayland/weston/-/commit/6c4a993a999048a2054ec97e71d32839b312c642
Adrian Perez de Castro (5):
package/wlroots: bump to version 0.13.0
package/seatd: new package
package/seatd: install init scripts
package/wlroots: use libseat when available
package/cage: bump to version 0.1.3
package/Config.in | 1 +
package/cage/cage.hash | 2 +-
package/cage/cage.mk | 7 +--
...pport-building-builtin-without-seatd.patch | 37 +++++++++++++
package/seatd/Config.in | 22 ++++++++
package/seatd/S70seatd | 38 ++++++++++++++
package/seatd/seatd.hash | 5 ++
package/seatd/seatd.mk | 52 +++++++++++++++++++
package/wlroots/Config.in | 3 ++
package/wlroots/wlroots.hash | 4 +-
package/wlroots/wlroots.mk | 25 ++++-----
11 files changed, 174 insertions(+), 22 deletions(-)
create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch
create mode 100644 package/seatd/Config.in
create mode 100755 package/seatd/S70seatd
create mode 100644 package/seatd/seatd.hash
create mode 100644 package/seatd/seatd.mk
--
2.31.1
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 1/5] package/wlroots: bump to version 0.13.0
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 2/5] package/seatd: new package Adrian Perez de Castro
` (5 subsequent siblings)
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: 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 and update the dependencies needed by the X11 support.
Note that the dependencies neded by the X11 backend are a superset of
the ones needed for XWayland support, so we can make toggle both Meson
options at once.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
- Add missing libxcb/xcb-util-{renderutil,wm} deps (suggested by
Yann).
- Make BR2_PACKAGE_WLROOTS_X11 enable both the X11 backend and
XWayland.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
package/wlroots/Config.in | 3 +++
package/wlroots/wlroots.hash | 4 ++--
package/wlroots/wlroots.mk | 22 ++++------------------
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in
index 694aa79de4..41f8986772 100644
--- a/package/wlroots/Config.in
+++ b/package/wlroots/Config.in
@@ -33,6 +33,9 @@ if BR2_PACKAGE_WLROOTS
config BR2_PACKAGE_WLROOTS_X11
bool "X11 backend"
depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XCB_UTIL_RENDERUTIL
+ select BR2_PACKAGE_XCB_UTIL_WM
select BR2_PACKAGE_XLIB_LIBX11
help
Support Wayland sessions nested inside a X11 window
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..a20f6683a9 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
@@ -40,24 +40,10 @@ WLROOTS_CONF_OPTS += -Dlogind=disabled
endif
ifeq ($(BR2_PACKAGE_WLROOTS_X11),y)
-WLROOTS_CONF_OPTS += -Dx11-backend=enabled
-WLROOTS_DEPENDENCIES += xlib_libX11
+WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled
+WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11
else
-WLROOTS_CONF_OPTS += -Dx11-backend=disabled
-endif
-
-ifeq ($(BR2_PACKAGE_LIBXCB),y)
-WLROOTS_CONF_OPTS += -Dxwayland=enabled
-WLROOTS_DEPENDENCIES += libxcb
-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
+WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled
endif
$(eval $(meson-package))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 2/5] package/seatd: new package
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 1/5] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 3/5] package/seatd: install init scripts Adrian Perez de Castro
` (4 subsequent siblings)
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: 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 the daemon
and the built-in mode, as to allow selecting the built-in mode as
default when both the daemon and systemd-logind are not being built.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
- Remove unneeded BR2_PACKAGE_SEATD_LIBSEAT config option (suggested
by Yann).
- Simplify to only have config options BR2_PACKAGE_SEATD_BUILTIN and
BR2_PACKAGE_SEATD_DAEMON, with the support for systemd-logind
checked directly from BR2_PACKAGE_SYSTEMD_LOGIND (suggested by Yann)
- Add missing "systemd" dependency if systemd-logind support is
enabled (suggested by Yann)
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
package/Config.in | 1 +
...pport-building-builtin-without-seatd.patch | 37 +++++++++++++++++++
package/seatd/Config.in | 22 +++++++++++
package/seatd/seatd.hash | 5 +++
package/seatd/seatd.mk | 37 +++++++++++++++++++
5 files changed, 102 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 45d75c71d0..1616b2f283 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2490,6 +2490,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 <kl@kl.wtf>
+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 <aperez@igalia.com>
+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..2c2efcb04e
--- /dev/null
+++ b/package/seatd/Config.in
@@ -0,0 +1,22 @@
+menuconfig BR2_PACKAGE_SEATD
+ bool "seatd"
+ select BR2_PACKAGE_SEATD_BUILTIN \
+ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON
+ help
+ Seat management daemon and support library.
+
+ https://git.sr.ht/~kennylevinsen/seatd
+
+if BR2_PACKAGE_SEATD
+
+config BR2_PACKAGE_SEATD_BUILTIN
+ bool "builtin backend"
+ help
+ Builtin in-process seatd implementation inside libseat.
+
+config BR2_PACKAGE_SEATD_DAEMON
+ bool "seatd daemon"
+ help
+ Build the seatd daemon and support for it inside libseat.
+
+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..2e90270555
--- /dev/null
+++ b/package/seatd/seatd.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# 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_SYSTEMD_LOGIND),y)
+SEATD_CONF_OPTS += -Dlogind=enabled
+SEATD_DEPENDENCIES += systemd
+else
+SEATD_CONF_OPTS += -Dlogind=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_SEATD_BUILTIN),y)
+SEATD_CONF_OPTS += -Dbuiltin=enabled
+else
+SEATD_CONF_OPTS += -Dbuiltin=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y)
+SEATD_CONF_OPTS += -Dseatd=enabled -Dserver=enabled
+else
+SEATD_CONF_OPTS += -Dseatd=disabled -Dserver=disabled
+endif
+
+$(eval $(meson-package))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 3/5] package/seatd: install init scripts
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 1/5] package/wlroots: bump to version 0.13.0 Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 2/5] package/seatd: new package Adrian Perez de Castro
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 4/5] package/wlroots: use libseat when available Adrian Perez de Castro
` (3 subsequent siblings)
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: buildroot
Add commands to the seatd package to install the systemd unit included
in the source tarball and a SysV init script, and ensure that the
"video" group gets created.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
- Add SEATD_USERS (suggested by Yann)
- Only install init scripts if BR2_PACKAGE_SEATD_DAEMON is enabled.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
package/seatd/S70seatd | 38 ++++++++++++++++++++++++++++++++++++++
package/seatd/seatd.mk | 15 +++++++++++++++
2 files changed, 53 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 2e90270555..2abcefbfaa 100644
--- a/package/seatd/seatd.mk
+++ b/package/seatd/seatd.mk
@@ -30,6 +30,21 @@ endif
ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y)
SEATD_CONF_OPTS += -Dseatd=enabled -Dserver=enabled
+
+define SEATD_USERS
+ - - video -1 - - - - -
+endef
+
+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
+
else
SEATD_CONF_OPTS += -Dseatd=disabled -Dserver=disabled
endif
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 4/5] package/wlroots: use libseat when available
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
` (2 preceding siblings ...)
2021-05-18 13:54 ` [Buildroot] [PATCH v2 3/5] package/seatd: install init scripts Adrian Perez de Castro
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 13:54 ` [Buildroot] [PATCH v2 5/5] package/cage: bump to version 0.1.3 Adrian Perez de Castro
` (2 subsequent siblings)
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: buildroot
Enable using libseat for seat management when possible.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
- No changes.
---
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 a20f6683a9..38ddba743d 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
@@ -46,4 +46,11 @@ else
WLROOTS_CONF_OPTS += -Dx11-backend=disabled -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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 5/5] package/cage: bump to version 0.1.3
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
` (3 preceding siblings ...)
2021-05-18 13:54 ` [Buildroot] [PATCH v2 4/5] package/wlroots: use libseat when available Adrian Perez de Castro
@ 2021-05-18 13:54 ` Adrian Perez de Castro
2021-05-18 14:00 ` [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland Adrian Perez de Castro
2021-05-18 17:11 ` Yann E. MORIN
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 13:54 UTC (permalink / raw)
To: 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 <aperez@igalia.com>
---
Changes v1 -> v2:
- No changes
---
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))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
` (4 preceding siblings ...)
2021-05-18 13:54 ` [Buildroot] [PATCH v2 5/5] package/cage: bump to version 0.1.3 Adrian Perez de Castro
@ 2021-05-18 14:00 ` Adrian Perez de Castro
2021-05-18 17:11 ` Yann E. MORIN
6 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-18 14:00 UTC (permalink / raw)
To: buildroot
On Tue, 18 May 2021 16:54:18 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> Hello!
>
> This patch set updates Cage to 0.1.3, which by itself does not have functional
> changes over the previous version, but it pulls in wlroots 0.13.0 which does
> include a good number of improvements.
Ah, I forgot to add in the subject line that this is for the ?next? branch;
it should read ?[PATCH next v2 x/5]? O:-)
> Last but not least, wlroots can now libseat to broker sessions, so three of
> the patches deal with adding a package for it, installing the daemon init
> scripts (if the daemon is enabled, as it is optional), and arranging for
> wlroots to use libseat when available. It looks like libseat is gaining
> momentum in the Wayland ecosystem and for example Weston can also use it
> since half a year ago [1].
>
> Best regards,
> -Adrian
>
> [1] https://gitlab.freedesktop.org/wayland/weston/-/commit/6c4a993a999048a2054ec97e71d32839b312c642
>
>
> Adrian Perez de Castro (5):
> package/wlroots: bump to version 0.13.0
> package/seatd: new package
> package/seatd: install init scripts
> package/wlroots: use libseat when available
> package/cage: bump to version 0.1.3
>
> package/Config.in | 1 +
> package/cage/cage.hash | 2 +-
> package/cage/cage.mk | 7 +--
> ...pport-building-builtin-without-seatd.patch | 37 +++++++++++++
> package/seatd/Config.in | 22 ++++++++
> package/seatd/S70seatd | 38 ++++++++++++++
> package/seatd/seatd.hash | 5 ++
> package/seatd/seatd.mk | 52 +++++++++++++++++++
> package/wlroots/Config.in | 3 ++
> package/wlroots/wlroots.hash | 4 +-
> package/wlroots/wlroots.mk | 25 ++++-----
> 11 files changed, 174 insertions(+), 22 deletions(-)
> create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch
> create mode 100644 package/seatd/Config.in
> create mode 100755 package/seatd/S70seatd
> create mode 100644 package/seatd/seatd.hash
> create mode 100644 package/seatd/seatd.mk
>
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/79d2eb4b/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland
2021-05-18 13:54 ` [Buildroot] [PATCH v2 0/5] " Adrian Perez de Castro
` (5 preceding siblings ...)
2021-05-18 14:00 ` [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland Adrian Perez de Castro
@ 2021-05-18 17:11 ` Yann E. MORIN
2021-05-27 13:41 ` Adrian Perez de Castro
6 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2021-05-18 17:11 UTC (permalink / raw)
To: buildroot
Adrian, All,
On 2021-05-18 16:54 +0300, Adrian Perez de Castro spake thusly:
> Hello!
>
> This patch set updates Cage to 0.1.3, which by itself does not have functional
> changes over the previous version, but it pulls in wlroots 0.13.0 which does
> include a good number of improvements.
>
> Last but not least, wlroots can now libseat to broker sessions, so three of
> the patches deal with adding a package for it, installing the daemon init
> scripts (if the daemon is enabled, as it is optional), and arranging for
> wlroots to use libseat when available. It looks like libseat is gaining
> momentum in the Wayland ecosystem and for example Weston can also use it
> since half a year ago [1].
Waiting for a patch series, then! ;-]
> Best regards,
> -Adrian
>
> [1] https://gitlab.freedesktop.org/wayland/weston/-/commit/6c4a993a999048a2054ec97e71d32839b312c642
>
>
> Adrian Perez de Castro (5):
> package/wlroots: bump to version 0.13.0
> package/seatd: new package
> package/seatd: install init scripts
> package/wlroots: use libseat when available
> package/cage: bump to version 0.1.3
Whole series applied to next, thanks.
Regards,
Yann E. MORIN.
> package/Config.in | 1 +
> package/cage/cage.hash | 2 +-
> package/cage/cage.mk | 7 +--
> ...pport-building-builtin-without-seatd.patch | 37 +++++++++++++
> package/seatd/Config.in | 22 ++++++++
> package/seatd/S70seatd | 38 ++++++++++++++
> package/seatd/seatd.hash | 5 ++
> package/seatd/seatd.mk | 52 +++++++++++++++++++
> package/wlroots/Config.in | 3 ++
> package/wlroots/wlroots.hash | 4 +-
> package/wlroots/wlroots.mk | 25 ++++-----
> 11 files changed, 174 insertions(+), 22 deletions(-)
> create mode 100644 package/seatd/0001-meson-Support-building-builtin-without-seatd.patch
> create mode 100644 package/seatd/Config.in
> create mode 100755 package/seatd/S70seatd
> create mode 100644 package/seatd/seatd.hash
> create mode 100644 package/seatd/seatd.mk
>
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH v2 0/5] Update Cage, wlroots, and wayland
2021-05-18 17:11 ` Yann E. MORIN
@ 2021-05-27 13:41 ` Adrian Perez de Castro
0 siblings, 0 replies; 25+ messages in thread
From: Adrian Perez de Castro @ 2021-05-27 13:41 UTC (permalink / raw)
To: buildroot
Hello Yann, all,
On Tue, 18 May 2021 19:11:33 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Adrian, All,
>
> On 2021-05-18 16:54 +0300, Adrian Perez de Castro spake thusly:
> > Hello!
> >
> > This patch set updates Cage to 0.1.3, which by itself does not have functional
> > changes over the previous version, but it pulls in wlroots 0.13.0 which does
> > include a good number of improvements.
> >
> > Last but not least, wlroots can now libseat to broker sessions, so three of
> > the patches deal with adding a package for it, installing the daemon init
> > scripts (if the daemon is enabled, as it is optional), and arranging for
> > wlroots to use libseat when available. It looks like libseat is gaining
> > momentum in the Wayland ecosystem and for example Weston can also use it
> > since half a year ago [1].
>
> Waiting for a patch series, then! ;-]
Your wish has been granted, sir!
https://patchwork.ozlabs.org/project/buildroot/patch/20210527133503.412330-1-aperez at igalia.com/
> > Best regards,
> > -Adrian
> >
> > [1] https://gitlab.freedesktop.org/wayland/weston/-/commit/6c4a993a999048a2054ec97e71d32839b312c642
> >
> >
> > Adrian Perez de Castro (5):
> > package/wlroots: bump to version 0.13.0
> > package/seatd: new package
> > package/seatd: install init scripts
> > package/wlroots: use libseat when available
> > package/cage: bump to version 0.1.3
>
> Whole series applied to next, thanks.
A small mistake slipped in, currently the check for seatd in ?wlroots.mk?
is using the wrong variable. Here goes a patch to fix it:
https://patchwork.ozlabs.org/project/buildroot/patch/20210527133752.413075-1-aperez at igalia.com/
Cheers,
-Adrian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210527/b3ad607a/attachment.asc>
^ permalink raw reply [flat|nested] 25+ messages in thread