From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 15 Jun 2024 16:59:17 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sIUs9-006WxV-1G for lore@lore.pengutronix.de; Sat, 15 Jun 2024 16:59:17 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sIUs8-00016r-C1; Sat, 15 Jun 2024 16:59:16 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sIUrZ-0000AE-Se; Sat, 15 Jun 2024 16:58:41 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sIUrZ-002Wed-GN; Sat, 15 Jun 2024 16:58:41 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sIUrZ-00HLwM-1V; Sat, 15 Jun 2024 16:58:41 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sat, 15 Jun 2024 16:58:41 +0200 Message-Id: <20240615145841.4135907-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240605204135.270043-1-rhi@pengutronix.de> References: <20240605204135.270043-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as da3db0e0e43af5a21a451129a89dd1e3bb78d383. Michael [sent from post-receive hook] On Sat, 15 Jun 2024 16:58:41 +0200, Roland Hieber wrote: > The linuxfb platform is useful for systems without wayland or graphics > acceleration hardware. > > Co-developed-by: Rouven Czerwinski > Signed-off-by: Rouven Czerwinski > Signed-off-by: Roland Hieber > Message-Id: <20240605204135.270043-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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