Skip to contentSkip to conversation

Add Cage and wlroots packages

RFC Superseded Adrian Perez de Castro 3 participants 9 messages May 16, 2019 – Jun 12, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Add Cage and wlroots packages

Hello,

This is a RFC patch series which adds the Cage Wayland compositor, and the wlroots library which is a dependency.

I find Cage well suited for kiosks and in general "single-application, fullscreen" use cases. I find it particularly suitable to use in combination with Cog (the WPE WebKit launcher), for many cases in which a full-fledged compositor like Weston is not really needed. A typical example is generating a small image to run a single Web application from a Raspberry Pi right after bootup.

I am considering adding one additional patch which enables installation of a systemd unit for Cage, if there is interest in that.

Cheers,
?Adri?n

Adrian Perez de Castro (2):
package/wlroots: new package
package/cage: new package

 package/Config.in                             |   2 +
 .../cage/0001-Updates-for-wlroots-0.6.0.patch | 264 ++++++++++++++++++
 package/cage/Config.in                        |  24 ++
 package/cage/cage.hash                        |   5 +
 package/cage/cage.mk                          |  19 ++
 package/wlroots/Config.in                     |  65 +++++
 package/wlroots/wlroots.hash                  |   5 +
 package/wlroots/wlroots.mk                    |  80 ++++++
 8 files changed, 464 insertions(+)
 create mode 100644 package/cage/0001-Updates-for-wlroots-0.6.0.patch
 create mode 100644 package/cage/Config.in
 create mode 100644 package/cage/cage.hash
 create mode 100644 package/cage/cage.mk
 create mode 100644 package/wlroots/Config.in
 create mode 100644 package/wlroots/wlroots.hash
 create mode 100644 package/wlroots/wlroots.mk
Signature · 1 line
2.21.0
#1 lore raw

RFC 1/2 package/wlroots: new package

wlroots is a modular library which provides building blocks to implement Wayland compositors. wlroots is a dependency of the Cage Wayland compositor.

https://github.com/swaywm/wlroots/

---
 package/Config.in            |  1 +
 package/wlroots/Config.in    | 65 +++++++++++++++++++++++++++++
 package/wlroots/wlroots.hash |  5 +++
 package/wlroots/wlroots.mk   | 80 ++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+)
 create mode 100644 package/wlroots/Config.in
 create mode 100644 package/wlroots/wlroots.hash
 create mode 100644 package/wlroots/wlroots.mk
package/Config.in +1 -0
index f592e74a99..5b1f279b8e 100644
@@ -1341,6 +1341,7 @@ menu "Graphics"
 	source "package/waylandpp/Config.in"
 	source "package/webkitgtk/Config.in"
 	source "package/webp/Config.in"
+	source "package/wlroots/Config.in"
 	source "package/woff2/Config.in"
 	source "package/wpebackend-fdo/Config.in"
 	source "package/wpewebkit/Config.in"
package/wlroots/Config.in new file +65 -0

65 lines not on this page · raw message

package/wlroots/wlroots.hash new file +5 -0
new file mode 100644
index 0000000000..dbb387a865
@@ -0,0 +1,5 @@
+# Generated locally
+sha256 9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70  0.6.0.tar.gz
+
+# Hashes for license files:
+sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b  LICENSE
package/wlroots/wlroots.mk new file +80 -0

80 lines not on this page · raw message

Signature · 1 line
2.21.0
#2 lore raw

RFC 1/2 package/wlroots: new package

Hello,

package/wlroots/Config.in line 3

Quoted 9 lines · On Fri, 17 May 2019 01:08:35 +0300 Adrian Perez de Castro <[email protected]>…
package/wlroots/Config.in new file +3 -0
new file mode 100644
index 0000000000..45db63f62c
@@ -0,0 +1,65 @@
+config BR2_PACKAGE_WLROOTS
+	bool "wlroots"
+	depends on !BR2_STATIC_LIBS # mesa3d, wayland

You're not selecting "mesa3d", so this "mesa3d" comment doesn't make sense.

package/wlroots/Config.in line 4

Quoted 1 line
package/wlroots/Config.in new file +1 -0
+	depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d

You're not selecting freerdp nor mesa3d, so the comment doesn't make sense either. This dependency doesn't seem to be needed at all.

package/wlroots/Config.in line 6

Quoted 2 lines
package/wlroots/Config.in new file +2 -0
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d

This dependency doesn't seem to be needed, at least you don't use mesa3d, and none of the packages you select has a "depends on BR2_TOOLCHAIN_HAS_SYNC".

package/wlroots/Config.in line 7

Quoted 1 line
package/wlroots/Config.in new file +1 -0
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d

Same.

package/wlroots/Config.in line 29

Quoted 5 lines
package/wlroots/Config.in new file +5 -0
+if BR2_PACKAGE_WLROOTS
+
+config BR2_PACKAGE_WLROOTS_RDP
+	bool "RDP backend support"
+	depends on BR2_PACKAGE_FREERDP

If you "depends on" something...

package/wlroots/Config.in line 32

Quoted 3 lines
package/wlroots/Config.in new file +3 -0
+	depends on BR2_USE_WCHAR # freerdp
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # freerdp

... there's no point in replicating its dependencies.

package/wlroots/Config.in line 23

Quoted 8 lines
package/wlroots/Config.in new file +8 -0
+WLROOTS_VERSION = 0.6.0
+WLROOTS_SITE = https://github.com/swaywm/wlroots/archive
+WLROOTS_SOURCE = $(WLROOTS_VERSION).tar.gz
+WLROOTS_LICENSE = MIT
+WLROOTS_INSTALL_STAGING = YES
+
+WLROOTS_DEPENDENCIES = host-pkgconf host-wayland libegl libinput \
+					   libxkbcommon mesa3d pixman udev \

Ah, so you have mesa3d in your dependencies, but you don't select it ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

RFC 1/2 package/wlroots: new package

Quoted 49 lines · Thomas Petazzoni

Hello,

package/wlroots/Config.in line 3

Quoted 9 lines · On Fri, 17 May 2019 01:08:35 +0300 Adrian Perez de Castro <[email protected]>…
package/wlroots/Config.in new file +3 -0
new file mode 100644
index 0000000000..45db63f62c
@@ -0,0 +1,65 @@
+config BR2_PACKAGE_WLROOTS
+	bool "wlroots"
+	depends on !BR2_STATIC_LIBS # mesa3d, wayland

You're not selecting "mesa3d", so this "mesa3d" comment doesn't make sense.

package/wlroots/Config.in line 4

Quoted 1 line
package/wlroots/Config.in new file +1 -0
+	depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d

You're not selecting freerdp nor mesa3d, so the comment doesn't make sense either. This dependency doesn't seem to be needed at all.

package/wlroots/Config.in line 6

Quoted 2 lines
package/wlroots/Config.in new file +2 -0
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d

This dependency doesn't seem to be needed, at least you don't use mesa3d, and none of the packages you select has a "depends on BR2_TOOLCHAIN_HAS_SYNC".

package/wlroots/Config.in line 7

Quoted 1 line
package/wlroots/Config.in new file +1 -0
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d

Same.

package/wlroots/Config.in line 29

Quoted 5 lines
package/wlroots/Config.in new file +5 -0
+if BR2_PACKAGE_WLROOTS
+
+config BR2_PACKAGE_WLROOTS_RDP
+	bool "RDP backend support"
+	depends on BR2_PACKAGE_FREERDP

If you "depends on" something...

package/wlroots/Config.in line 32

Quoted 3 lines
package/wlroots/Config.in new file +3 -0
+	depends on BR2_USE_WCHAR # freerdp
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # freerdp

... there's no point in replicating its dependencies.

Quoted 10 lines

package/wlroots/Config.in line 23

Quoted 8 lines
package/wlroots/Config.in new file +8 -0
+WLROOTS_VERSION = 0.6.0
+WLROOTS_SITE = https://github.com/swaywm/wlroots/archive
+WLROOTS_SOURCE = $(WLROOTS_VERSION).tar.gz
+WLROOTS_LICENSE = MIT
+WLROOTS_INSTALL_STAGING = YES
+
+WLROOTS_DEPENDENCIES = host-pkgconf host-wayland libegl libinput \
+					   libxkbcommon mesa3d pixman udev \

Ah, so you have mesa3d in your dependencies, but you don't select it ?

I was just double checking now and... it's complicated. While in theory Mesa is not strictly needed (any EGL driver with Wayland support should do), then wlroots wants to *also* have libgbm which is part of Mesa...

While in theory other implementations of libgbm should work, there is none other than Mesa's in Buildroot. Probably the best option here is to use:

depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
depends on BR2_PACKAGE_MESA3D_OPENGL_ES

At least that's what other packages do ?\_(?)_/?

?Adri?n

P.S: I'll fix the depends/selects before submitting v2 of the patchset.

-------------- 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/20190613/df430892/attachment.asc>

#4 lore raw

RFC 1/2 package/wlroots: new package

In reply to Adrian Perez de Castro

Le ven. 17 mai 2019 ? 00:09, Adrian Perez de Castro <[email protected]> a ?crit :

Quoted 135 lines

wlroots is a modular library which provides building blocks to implement Wayland compositors. wlroots is a dependency of the Cage Wayland compositor.

https://github.com/swaywm/wlroots/

---
 package/Config.in            |  1 +
 package/wlroots/Config.in    | 65 +++++++++++++++++++++++++++++
 package/wlroots/wlroots.hash |  5 +++
 package/wlroots/wlroots.mk   | 80 ++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+)
 create mode 100644 package/wlroots/Config.in
 create mode 100644 package/wlroots/wlroots.hash
 create mode 100644 package/wlroots/wlroots.mk
package/Config.in +1 -0
index f592e74a99..5b1f279b8e 100644
@@ -1341,6 +1341,7 @@ menu "Graphics"
        source "package/waylandpp/Config.in"
        source "package/webkitgtk/Config.in"
        source "package/webp/Config.in"
+       source "package/wlroots/Config.in"
        source "package/woff2/Config.in"
        source "package/wpebackend-fdo/Config.in"
        source "package/wpewebkit/Config.in"
package/wlroots/Config.in new file +65 -0
new file mode 100644
index 0000000000..45db63f62c
@@ -0,0 +1,65 @@
+config BR2_PACKAGE_WLROOTS
+       bool "wlroots"
+       depends on !BR2_STATIC_LIBS # mesa3d, wayland
+       depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+       depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
+       depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
+       depends on BR2_ENABLE_LOCALE # libinput
+       depends on BR2_PACKAGE_HAS_UDEV # libinput
+       depends on BR2_PACKAGE_HAS_LIBEGL
+       depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+       depends on BR2_PACKAGE_HAS_LIBGLES
+       select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_LIBINPUT
+       select BR2_PACKAGE_LIBXKBCOMMON
+       select BR2_PACKAGE_PIXMAN
+       select BR2_PACKAGE_WAYLAND
+       select BR2_PACKAGE_WAYLAND_PROTOCOLS
+       help
+         wlroots is a modular Wayland library for building compositors
+         which implements many of their common features.
+
+         https://github.com/swaywm/wlroots
+
+if BR2_PACKAGE_WLROOTS
+
+config BR2_PACKAGE_WLROOTS_RDP
+       bool "RDP backend support"
+       depends on BR2_PACKAGE_FREERDP
+       depends on BR2_USE_WCHAR # freerdp
+       depends on BR2_USE_MMU # libglib2
+       depends on BR2_TOOLCHAIN_HAS_SYNC_4 # freerdp
+       help
+         Support Wayland sessions served using the RDP protocol
+
+comment "RDP backend support needs FreeRDP"
+       depends on !BR2_PACKAGE_FREERDP
+
+config BR2_PACKAGE_WLROOTS_X11
+       bool "X11 backend support"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_LIBXCB
+       select BR2_PACKAGE_XLIB_LIBX11
+       help
+         Support Wayland sessions nested inside a X11 window
+
+comment "X11 backend support needs X.org enabled"
+       depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_WLROOTS_XWAYLAND
+       bool "XWayland support"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_LIBXCB
+       help
+         Enable support for XWayland
+
+comment "XWayland support needs X.org enabled"
+       depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_WLROOTS_ROOTSTON
+       bool "rootston"
+       help
+         Build and install the rootston example compositor
+
+endif
package/wlroots/wlroots.hash new file +2 -0
new file mode 100644
index 0000000000..dbb387a865
@@ -0,0 +1,5 @@
+# Generated locally
+sha256 9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70

0.6.0.tar.gz

package/wlroots/wlroots.hash new file +3 -0
+
+# Hashes for license files:
+sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b

LICENSE

package/wlroots/wlroots.mk new file +14 -0
new file mode 100644
index 0000000000..9d3581fd6f
@@ -0,0 +1,80 @@
 
+################################################################################
+#
+# wlroots
+#
 
+################################################################################
+
+WLROOTS_VERSION = 0.6.0
+WLROOTS_SITE = https://github.com/swaywm/wlroots/archive
+WLROOTS_SOURCE = $(WLROOTS_VERSION).tar.gz
+WLROOTS_LICENSE = MIT
+WLROOTS_INSTALL_STAGING = YES
+
+WLROOTS_DEPENDENCIES = host-pkgconf host-wayland libegl libinput \
+                                          libxkbcommon mesa3d pixman udev
Quoted 3 lines

\
+ wayland wayland-protocols

wlroots has the same issue as WPEBackend-fdo:

Quoted 1 line
Quoted 1 line
Quoted 1 line

wlroots 0.6.0 Configuring

Native dependency wayland-scanner found: YES 1.17.0 Program /usr/bin/wayland-scanner found: NO

protocol/meson.build:5:1: ERROR: Program(s) ['/usr/bin/wayland-scanner'] not found or not executable

Fran?ois

Quoted 69 lines
package/wlroots/wlroots.mk new file +65 -2
+
+WLROOTS_CONF_OPTS = -Dexamples=false
+
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+WLROOTS_DEPENDENCIES += ffmpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+WLROOTS_CONF_OPTS += -Dlibcap=enabled
+WLROOTS_DEPENDENCIES += libcap
+else
+WLROOTS_CONF_OPTS += -Dlibcap=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+WLROOTS_DEPENDENCIES += libpng
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y)
+WLROOTS_CONF_OPTS += -Dlogind=enabled -Dlogind-provider=systemd
+WLROOTS_DEPENDENCIES += systemd
+else
+WLROOTS_CONF_OPTS += -Dlogind=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_RDP),y)
+WLROOTS_CONF_OPTS += -Dfreerdp=enabled
+WLROOTS_DEPENDENCIES += freerdp
+else
+WLROOTS_CONF_OPTS += -Dfreerdp=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_X11),y)
+WLROOTS_CONF_OPTS += -Dx11-backend=enabled
+WLROOTS_DEPENDENCIES += xlib_libX11
+else
+WLROOTS_CONF_OPTS += -Dx11-backend=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y)
+WLROOTS_CONF_OPTS += -Dxwayland=enabled
+WLROOTS_DEPENDENCIES += libxcb
+ifeq ($(BR2_PACKAGE_XCB_UTIL),y)
+WLROOTS_CONF_OPTS += -Dxcb-errors=enabled
+WLROOTS_DEPENDENCIES += xcb-util
+else
+WLROOTS_CONF_OPTS += -Dxcb-errors=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
+else
+WLROOTS_CONF_OPTS += -Dxwayland=disabled -Dxcb-errors=disabled
-Dxcb-icccm=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_ROOTSTON),y)
+WLROOTS_CONF_OPTS += -Drootston=true
+else
+WLROOTS_CONF_OPTS += -Drootston=false
+endif
+
+$(eval $(meson-package))
--

2.21.0

Quoted 5 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190518/1f00d5f1/attachment.html>

#5 lore raw

RFC 1/2 package/wlroots: new package

Hello Fran?ois,

Quoted 143 lines · Fran?ois Perrad

Le ven. 17 mai 2019 ? 00:09, Adrian Perez de Castro <[email protected]> a ?crit :

Quoted 135 lines

wlroots is a modular library which provides building blocks to implement Wayland compositors. wlroots is a dependency of the Cage Wayland compositor.

https://github.com/swaywm/wlroots/

---
 package/Config.in            |  1 +
 package/wlroots/Config.in    | 65 +++++++++++++++++++++++++++++
 package/wlroots/wlroots.hash |  5 +++
 package/wlroots/wlroots.mk   | 80 ++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+)
 create mode 100644 package/wlroots/Config.in
 create mode 100644 package/wlroots/wlroots.hash
 create mode 100644 package/wlroots/wlroots.mk
package/Config.in +1 -0
index f592e74a99..5b1f279b8e 100644
@@ -1341,6 +1341,7 @@ menu "Graphics"
        source "package/waylandpp/Config.in"
        source "package/webkitgtk/Config.in"
        source "package/webp/Config.in"
+       source "package/wlroots/Config.in"
        source "package/woff2/Config.in"
        source "package/wpebackend-fdo/Config.in"
        source "package/wpewebkit/Config.in"
package/wlroots/Config.in new file +65 -0
new file mode 100644
index 0000000000..45db63f62c
@@ -0,0 +1,65 @@
+config BR2_PACKAGE_WLROOTS
+       bool "wlroots"
+       depends on !BR2_STATIC_LIBS # mesa3d, wayland
+       depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+       depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
+       depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
+       depends on BR2_ENABLE_LOCALE # libinput
+       depends on BR2_PACKAGE_HAS_UDEV # libinput
+       depends on BR2_PACKAGE_HAS_LIBEGL
+       depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+       depends on BR2_PACKAGE_HAS_LIBGLES
+       select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_LIBINPUT
+       select BR2_PACKAGE_LIBXKBCOMMON
+       select BR2_PACKAGE_PIXMAN
+       select BR2_PACKAGE_WAYLAND
+       select BR2_PACKAGE_WAYLAND_PROTOCOLS
+       help
+         wlroots is a modular Wayland library for building compositors
+         which implements many of their common features.
+
+         https://github.com/swaywm/wlroots
+
+if BR2_PACKAGE_WLROOTS
+
+config BR2_PACKAGE_WLROOTS_RDP
+       bool "RDP backend support"
+       depends on BR2_PACKAGE_FREERDP
+       depends on BR2_USE_WCHAR # freerdp
+       depends on BR2_USE_MMU # libglib2
+       depends on BR2_TOOLCHAIN_HAS_SYNC_4 # freerdp
+       help
+         Support Wayland sessions served using the RDP protocol
+
+comment "RDP backend support needs FreeRDP"
+       depends on !BR2_PACKAGE_FREERDP
+
+config BR2_PACKAGE_WLROOTS_X11
+       bool "X11 backend support"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_LIBXCB
+       select BR2_PACKAGE_XLIB_LIBX11
+       help
+         Support Wayland sessions nested inside a X11 window
+
+comment "X11 backend support needs X.org enabled"
+       depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_WLROOTS_XWAYLAND
+       bool "XWayland support"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_LIBXCB
+       help
+         Enable support for XWayland
+
+comment "XWayland support needs X.org enabled"
+       depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_WLROOTS_ROOTSTON
+       bool "rootston"
+       help
+         Build and install the rootston example compositor
+
+endif
package/wlroots/wlroots.hash new file +2 -0
new file mode 100644
index 0000000000..dbb387a865
@@ -0,0 +1,5 @@
+# Generated locally
+sha256 9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70

0.6.0.tar.gz

package/wlroots/wlroots.hash new file +3 -0
+
+# Hashes for license files:
+sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b

LICENSE

package/wlroots/wlroots.mk new file +14 -0
new file mode 100644
index 0000000000..9d3581fd6f
@@ -0,0 +1,80 @@
 
+################################################################################
+#
+# wlroots
+#
 
+################################################################################
+
+WLROOTS_VERSION = 0.6.0
+WLROOTS_SITE = https://github.com/swaywm/wlroots/archive
+WLROOTS_SOURCE = $(WLROOTS_VERSION).tar.gz
+WLROOTS_LICENSE = MIT
+WLROOTS_INSTALL_STAGING = YES
+
+WLROOTS_DEPENDENCIES = host-pkgconf host-wayland libegl libinput \
+                                          libxkbcommon mesa3d pixman udev
Quoted 3 lines

\
+ wayland wayland-protocols

wlroots has the same issue as WPEBackend-fdo:

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

wlroots 0.6.0 Configuring

Native dependency wayland-scanner found: YES 1.17.0 Program /usr/bin/wayland-scanner found: NO

protocol/meson.build:5:1: ERROR: Program(s) ['/usr/bin/wayland-scanner'] not found or not executable

Good catch, somehow I missed this when checking the build logs for my test build before submitting.

I have proposed a patch to be applied upstream [1], which I will include as part of the improvements in v2 of the patchset =)

Quoted 60 lines
Quoted 60 lines
package/wlroots/wlroots.mk new file +59 -1
+
+WLROOTS_CONF_OPTS = -Dexamples=false
+
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+WLROOTS_DEPENDENCIES += ffmpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+WLROOTS_CONF_OPTS += -Dlibcap=enabled
+WLROOTS_DEPENDENCIES += libcap
+else
+WLROOTS_CONF_OPTS += -Dlibcap=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+WLROOTS_DEPENDENCIES += libpng
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y)
+WLROOTS_CONF_OPTS += -Dlogind=enabled -Dlogind-provider=systemd
+WLROOTS_DEPENDENCIES += systemd
+else
+WLROOTS_CONF_OPTS += -Dlogind=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_RDP),y)
+WLROOTS_CONF_OPTS += -Dfreerdp=enabled
+WLROOTS_DEPENDENCIES += freerdp
+else
+WLROOTS_CONF_OPTS += -Dfreerdp=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_X11),y)
+WLROOTS_CONF_OPTS += -Dx11-backend=enabled
+WLROOTS_DEPENDENCIES += xlib_libX11
+else
+WLROOTS_CONF_OPTS += -Dx11-backend=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y)
+WLROOTS_CONF_OPTS += -Dxwayland=enabled
+WLROOTS_DEPENDENCIES += libxcb
+ifeq ($(BR2_PACKAGE_XCB_UTIL),y)
+WLROOTS_CONF_OPTS += -Dxcb-errors=enabled
+WLROOTS_DEPENDENCIES += xcb-util
+else
+WLROOTS_CONF_OPTS += -Dxcb-errors=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
+else
+WLROOTS_CONF_OPTS += -Dxwayland=disabled -Dxcb-errors=disabled
-Dxcb-icccm=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_WLROOTS_ROOTSTON),y)
Quoted 8 lines
Quoted 8 lines
package/wlroots/wlroots.mk new file +6 -1
+WLROOTS_CONF_OPTS += -Drootston=true
+else
+WLROOTS_CONF_OPTS += -Drootston=false
+endif
+
+$(eval $(meson-package))
--

2.21.0

Cheers,
?Adri?n

---
[1] https://github.com/swaywm/wlroots/pull/1722
-------------- 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/20190613/2572c9cc/attachment.asc>

#6 lore raw

RFC 2/2 package/cage: new package

In reply to Adrian Perez de Castro

Cage is a "kiosk" Wayland compositor, which shows a single maximized application at a time and limits user interaction to that application.

https://www.hjdskes.nl/projects/cage/

---
 package/Config.in                             |   1 +
 .../cage/0001-Updates-for-wlroots-0.6.0.patch | 264 ++++++++++++++++++
 package/cage/Config.in                        |  24 ++
 package/cage/cage.hash                        |   5 +
 package/cage/cage.mk                          |  19 ++
 5 files changed, 313 insertions(+)
 create mode 100644 package/cage/0001-Updates-for-wlroots-0.6.0.patch
 create mode 100644 package/cage/Config.in
 create mode 100644 package/cage/cage.hash
 create mode 100644 package/cage/cage.mk
package/Config.in +1 -0
index 5b1f279b8e..7cac6de79f 100644
@@ -328,6 +328,7 @@ comment "QT libraries and helper libraries"
 	source "package/quazip/Config.in"
 	source "package/qwt/Config.in"
 endif
+	source "package/cage/Config.in"
 	source "package/tekui/Config.in"
 	source "package/weston/Config.in"
 	source "package/x11r7/Config.in"
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +264 -0

264 lines not on this page · raw message

package/cage/Config.in new file +24 -0
new file mode 100644
index 0000000000..07dc4c9da3
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_CAGE
+	bool "cage"
+	depends on !BR2_STATIC_LIBS # wlroots
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
+	select BR2_PACKAGE_WLROOTS
+	help
+	  Kiosk compositor for Wayland, which displays a single
+	  maximized application at a time.
+
+	  https://www.hjdskes.nl/projects/cage/
+
+if BR2_PACKAGE_CAGE
+
+config BR2_PACKAGE_CAGE_XWAYLAND
+	bool "XWayland support"
+	depends on BR2_PACKAGE_XORG7 # wlroots
+	depends on BR2_PACKAGE_WLROOTS_XWAYLAND
+	help
+	  Enable support for running X11 applications through XWayland
+
+comment "XWayland supports needs X.org and support in wlroots enabled"
+	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_WLROOTS_XWAYLAND
+
+endif
package/cage/cage.hash new file +5 -0
new file mode 100644
index 0000000000..5609b073d6
@@ -0,0 +1,5 @@
+# Generated locally
+sha256 03e2b4d97744aead935f4a289e5cfda4888dd06c6586982f4a25c8f435ef4166  v0.1.tar.gz
+
+# Hashes for license files:
+sha256 1fd28695090b961ed2846627365489228d84f784bff60a90e933febcedaeb65d  LICENSE
package/cage/cage.mk new file +19 -0
new file mode 100644
index 0000000000..b24eb743ee
@@ -0,0 +1,19 @@
+################################################################################
+#
+# cage
+#
+################################################################################
+
+CAGE_VERSION = 0.1
+CAGE_SITE = https://github.com/Hjdskes/cage/archive
+CAGE_SOURCE = v$(CAGE_VERSION).tar.gz
+CAGE_LICENSE = MIT
+CAGE_DEPENDENCIES = host-pkgconf wlroots
+
+ifeq ($(BR2_PACKAGE_CAGE_XWAYLAND),y)
+CAGE_CONF_OPTS = -Dxwayland=true
+else
+CAGE_CONF_OPTS = -Dxwayland=false
+endif
+
+$(eval $(meson-package))
Signature · 1 line
2.21.0
#7 lore raw

RFC 2/2 package/cage: new package

Hello Adrian,

Quoted 9 lines · On Fri, 17 May 2019 01:08:36 +0300 Adrian Perez de Castro <[email protected]>…
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +3 -0
new file mode 100644
index 0000000000..57e5a1289a
@@ -0,0 +1,264 @@
+From 86b9d6719e52cbddda4fb6d055e60e9caf9a57ff Mon Sep 17 00:00:00 2001
+From: Jente Hidskes <[email protected]>
+Date: Fri, 3 May 2019 19:39:19 +0200

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 13

Quoted 10 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +10 -0
+Subject: [PATCH 1/3] CI: use wlroots 0.6.0
+
+Signed-off-by: Adrian Perez de Castro <[email protected]>
+[Upstream status: https://github.com/Hjdskes/cage/pull/65]
+
+---
+ .builds/alpine.yml    | 4 ++--
+ .builds/archlinux.yml | 4 ++--
+ .builds/freebsd.yml   | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)

These CI related changes are really not relevant in the context of Buildroot.

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 64

Quoted 4 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +4 -0
+From 08ecd52a3313d00d06cc4e12d4d3243865af5dd0 Mon Sep 17 00:00:00 2001
+From: Drew DeVault <[email protected]>
+Date: Thu, 25 Apr 2019 11:40:25 -0400
+Subject: [PATCH 2/3] Update to wlroots 0.6.0

Please use one .patch file for each patch.

Your SoB is missing.

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 150

Quoted 8 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +8 -0
+From 711aebb4d20848d2d9052e0483cd301c7022b844 Mon Sep 17 00:00:00 2001
+From: Jente Hidskes <[email protected]>
+Date: Fri, 3 May 2019 20:53:19 +0200
+Subject: [PATCH 3/3] output: don't submit too much damage
+
+See https://github.com/swaywm/wlroots/issues/1666#issue-436967396 and
+the linked changes
+https://github.com/swaywm/wlroots/pull/1668/files#diff-95fe5e5b411cc64a5dc31e2b72669a0d

Ditto.

package/cage/Config.in line 4

Quoted 11 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +1 -0
+ 		view_for_each_surface(view, send_frame_done, &now);
package/cage/Config.in new file +4 -0
new file mode 100644
index 0000000000..07dc4c9da3
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_CAGE
+	bool "cage"
+	depends on !BR2_STATIC_LIBS # wlroots
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots

wlroots (in your submission) has plenty of other depends on you need to replicate:

+ depends on !BR2_STATIC_LIBS # mesa3d, wayland
+ depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+ depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
+ depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
+ depends on BR2_ENABLE_LOCALE # libinput
+ depends on BR2_PACKAGE_HAS_UDEV # libinput
+ depends on BR2_PACKAGE_HAS_LIBEGL
+ depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on BR2_PACKAGE_HAS_LIBGLES

package/cage/Config.in line 16

Quoted 12 lines
package/cage/Config.in new file +12 -0
+	select BR2_PACKAGE_WLROOTS
+	help
+	  Kiosk compositor for Wayland, which displays a single
+	  maximized application at a time.
+
+	  https://www.hjdskes.nl/projects/cage/
+
+if BR2_PACKAGE_CAGE
+
+config BR2_PACKAGE_CAGE_XWAYLAND
+	bool "XWayland support"
+	depends on BR2_PACKAGE_XORG7 # wlroots

Not necessary, because you have a "depends on
BR2_PACKAGE_WLROOTS_XWAYLAND" below.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

RFC 2/2 package/cage: new package

Hi,

Quoted 28 lines · Thomas Petazzoni

Hello Adrian,

Quoted 9 lines · On Fri, 17 May 2019 01:08:36 +0300 Adrian Perez de Castro <[email protected]>…
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +3 -0
new file mode 100644
index 0000000000..57e5a1289a
@@ -0,0 +1,264 @@
+From 86b9d6719e52cbddda4fb6d055e60e9caf9a57ff Mon Sep 17 00:00:00 2001
+From: Jente Hidskes <[email protected]>
+Date: Fri, 3 May 2019 19:39:19 +0200

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 13

Quoted 10 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +10 -0
+Subject: [PATCH 1/3] CI: use wlroots 0.6.0
+
+Signed-off-by: Adrian Perez de Castro <[email protected]>
+[Upstream status: https://github.com/Hjdskes/cage/pull/65]
+
+---
+ .builds/alpine.yml    | 4 ++--
+ .builds/archlinux.yml | 4 ++--
+ .builds/freebsd.yml   | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)

These CI related changes are really not relevant in the context of Buildroot.

Quoted 8 lines

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 64

Quoted 4 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +4 -0
+From 08ecd52a3313d00d06cc4e12d4d3243865af5dd0 Mon Sep 17 00:00:00 2001
+From: Drew DeVault <[email protected]>
+Date: Thu, 25 Apr 2019 11:40:25 -0400
+Subject: [PATCH 2/3] Update to wlroots 0.6.0

Please use one .patch file for each patch.

Your SoB is missing.

I have been waiting for the release of Cage 0.1.1 [1], which makes this patch unneeded and I will drop it in v2 of the patch set.

Quoted 27 lines

package/cage/0001-Updates-for-wlroots-0.6.0.patch line 150

Quoted 8 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +8 -0
+From 711aebb4d20848d2d9052e0483cd301c7022b844 Mon Sep 17 00:00:00 2001
+From: Jente Hidskes <[email protected]>
+Date: Fri, 3 May 2019 20:53:19 +0200
+Subject: [PATCH 3/3] output: don't submit too much damage
+
+See https://github.com/swaywm/wlroots/issues/1666#issue-436967396 and
+the linked changes
+https://github.com/swaywm/wlroots/pull/1668/files#diff-95fe5e5b411cc64a5dc31e2b72669a0d

Ditto.

package/cage/Config.in line 4

Quoted 11 lines
package/cage/0001-Updates-for-wlroots-0.6.0.patch new file +1 -0
+ 		view_for_each_surface(view, send_frame_done, &now);
package/cage/Config.in new file +4 -0
new file mode 100644
index 0000000000..07dc4c9da3
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_CAGE
+	bool "cage"
+	depends on !BR2_STATIC_LIBS # wlroots
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots

wlroots (in your submission) has plenty of other depends on you need to replicate:

Review

Quoted 10 lines
(quoted diff) +10 -0
+	depends on !BR2_STATIC_LIBS # mesa3d, wayland
+	depends on BR2_INSTALL_LIBSTDCPP # freedrp, mesa3d
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
+	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
+	depends on BR2_ENABLE_LOCALE # libinput
+	depends on BR2_PACKAGE_HAS_UDEV # libinput
+	depends on BR2_PACKAGE_HAS_LIBEGL
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+	depends on BR2_PACKAGE_HAS_LIBGLES

It would be nice if those would be automagically propagated?I always end up messing them in one way or another when adding new packages O:-)

I'll review them for v2.

Quoted 7 lines
Quoted 7 lines
package/cage/Config.in new file +7 -0
+	select BR2_PACKAGE_WLROOTS
+	help
+	  Kiosk compositor for Wayland, which displays a single
+	  maximized application at a time.
+
+	  https://www.hjdskes.nl/projects/cage/
+
Quoted 8 lines

package/cage/Config.in line 16

Quoted 5 lines
package/cage/Config.in new file +5 -0
+if BR2_PACKAGE_CAGE
+
+config BR2_PACKAGE_CAGE_XWAYLAND
+	bool "XWayland support"
+	depends on BR2_PACKAGE_XORG7 # wlroots

Not necessary, because you have a "depends on
BR2_PACKAGE_WLROOTS_XWAYLAND" below.

True.

Thanks for the review,
?Adri?n

---
[1] https://github.com/Hjdskes/cage/releases/tag/v0.1.1

-------------- 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/20190613/1c93ffa6/attachment.asc>