Re: [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as da3db0e0e43af5a21a451129a89dd1e3bb78d383.

Michael

[sent from post-receive hook]

On Sat, 15 Jun 2024 16:58:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The linuxfb platform is useful for systems without wayland or graphics
> acceleration hardware.
> 
> Co-developed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240605204135.270043-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/qt6.in b/rules/qt6.in
> index 36c2bddf160d..d50115f42b01 100644
> --- a/rules/qt6.in
> +++ b/rules/qt6.in
> @@ -166,6 +166,7 @@ comment "supported plugins"
>  config QT6_PLATFORM_DEFAULT
>  	string
>  	default "eglfs"		if QT6_PLATFORM_DEFAULT_EGLFS
> +	default "linuxfb"	if QT6_PLATFORM_DEFAULT_LINUXFB
>  	default "wayland"	if QT6_PLATFORM_DEFAULT_WAYLAND
>  
>  config QT6_PLATFORM_EGLFS
> @@ -173,6 +174,10 @@ config QT6_PLATFORM_EGLFS
>  	prompt "eglfs"
>  	select QT6_OPENGL
>  
> +config QT6_PLATFORM_LINUXFB
> +	bool
> +	prompt "linuxfb"
> +
>  comment "default plugin"
>  
>  choice
> @@ -185,6 +190,7 @@ config QT6_PLATFORM_DEFAULT_MISSING
>  	bool
>  	prompt "--nothing--"
>  	depends on !QT6_PLATFORM_EGLFS
> +	depends on !QT6_PLATFORM_LINUXFB
>  	depends on !QT6_MODULE_QTWAYLAND
>  
>  config QT6_PLATFORM_DEFAULT_EGLFS
> @@ -192,6 +198,11 @@ config QT6_PLATFORM_DEFAULT_EGLFS
>  	depends on QT6_PLATFORM_EGLFS
>  	prompt "eglfs"
>  
> +config QT6_PLATFORM_DEFAULT_LINUXFB
> +	bool
> +	depends on QT6_PLATFORM_LINUXFB
> +	prompt "linuxfb"
> +
>  config QT6_PLATFORM_DEFAULT_WAYLAND
>  	bool
>  	depends on QT6_MODULE_QTWAYLAND
> diff --git a/rules/qt6.make b/rules/qt6.make
> index fa1f4996925b..3ebd2fef15d5 100644
> --- a/rules/qt6.make
> +++ b/rules/qt6.make
> @@ -251,7 +251,7 @@ QT6_CONF_OPT += \
>  	-DFEATURE_library=ON \
>  	-DFEATURE_libudev=$(call ptx/onoff,PTXCONF_QT6_LIBUDEV) \
>  	-DFEATURE_linux_netlink=ON \
> -	-DFEATURE_linuxfb=OFF \
> +	-DFEATURE_linuxfb=$(call ptx/onoff,PTXCONF_QT6_PLATFORM_LINUXFB) \
>  	-DFEATURE_localserver=ON \
>  	-DFEATURE_lttng=OFF \
>  	-DFEATURE_macdeployqt=OFF \
> @@ -973,6 +973,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS)			+= platforms/libqeglfs
>  QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI)			+= platforms/libqminimal
>  QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS)			+= platforms/libqminimalegl
>  QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI)			+= platforms/libqoffscreen
> +QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_LINUXFB)			+= platforms/libqlinuxfb
>  QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS)			+= egldeviceintegrations/libqeglfs-kms-integration
>  QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_MYSQL)		+= sqldrivers/libqsqlmysql
>  QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_SQLITE)		+= sqldrivers/libqsqlite