Re: [Buildroot] [PATCH v9 11/14] package/qt6/qt6wayland: new package

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello Roy,

On Tue, 25 Jun 2024 23:18:35 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:

> diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
> new file mode 100644
> index 0000000000..11179a4416
> --- /dev/null
> +++ b/package/qt6/qt6wayland/Config.in
> @@ -0,0 +1,27 @@
> +comment "qt6wayland needs an OpenGL-capable backend"
> +	depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
> +
> +config BR2_PACKAGE_QT6WAYLAND
> +	bool "qt6wayland"
> +	depends on BR2_PACKAGE_QT6_GL_SUPPORTS
> +	select BR2_PACKAGE_WAYLAND
> +	select BR2_PACKAGE_QT6BASE_GUI
> +	select BR2_PACKAGE_HOST_QT6BASE_GUI

I added a small comment above this line that explains why it is needed.


> +QT6WAYLAND_LICENSE = \
> +	GPL-2.0+ or LGPL-3.0, \
> +	GPL-3.0, GFDL-1.3 no invariants (docs)

Changed to:

QT6WAYLAND_LICENSE = \
	BSD-3-Clause (examples, tests), \
	GPL-3.0 (compositor), \
	LGPL-3.0 or GPL-2.0 or GPL-3.0, \
	GPL-3.0 WITH Qt-GPL-exception-1.0 (tests), \
	GFDL-1.3 no invariants (docs)

> +QT6WAYLAND_DEPENDENCIES = \
> +	qt6base \
> +	wayland \
> +	host-qt6wayland

Added a comment that explains why host-qt6wayland is needed.

> +
> +HOST_QT6WAYLAND_CONF_OPTS = \
> +	-DFEATURE_wayland_client=OFF \
> +	-DFEATURE_wayland_server=OFF
> +
> +HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base

I have moved these HOST_ variables further down, to not mix variable
definitions for the host package and for the target package.

> +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y)
> +QT6WAYLAND_DEPENDENCIES += qt6declarative
> +endif
> +
> +ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
> +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
> +QT6WAYLAND_DEPENDENCIES += libxkbcommon
> +else
> +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
> +endif

Applied with those changes. Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot