| Message ID | 1509658876-29888-1-git-send-email-joshua.henderson@microchip.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4] qt5: remove Qt Quick dependency on opengl | expand |
Hello, On Thu, 2 Nov 2017 14:41:16 -0700, Joshua Henderson wrote: > diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch > new file mode 100644 > index 0000000..aca93be > --- /dev/null > +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch > @@ -0,0 +1,29 @@ > +From fa52bb665d6beb77a951c14c8edcba3541850afc Mon Sep 17 00:00:00 2001 > +From: Allan Sandfeld Jensen <allan.jensen@qt.io> > +Date: Mon, 25 Sep 2017 16:53:24 +0200 > +Subject: [PATCH] Fix no-opengl builds > + > +The qquickwidgets examples uses OpenGL directly > + > +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 > +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Who did the backport of this patch in Buildroot? It should carry the Signed-off-by from the person who did this backport. I don't know if it's you or Sébastien Szymanski. Also, another question: I assume that if OpenGL is available, Qt Quick will use it. How does it detect that OpenGL is available? Thanks! Thomas
Thomas, On 11/02/2017 03:03 PM, Thomas Petazzoni wrote: > Hello, > > On Thu, 2 Nov 2017 14:41:16 -0700, Joshua Henderson wrote: > >> diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch >> new file mode 100644 >> index 0000000..aca93be >> --- /dev/null >> +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch >> @@ -0,0 +1,29 @@ >> +From fa52bb665d6beb77a951c14c8edcba3541850afc Mon Sep 17 00:00:00 2001 >> +From: Allan Sandfeld Jensen <allan.jensen@qt.io> >> +Date: Mon, 25 Sep 2017 16:53:24 +0200 >> +Subject: [PATCH] Fix no-opengl builds >> + >> +The qquickwidgets examples uses OpenGL directly >> + >> +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 >> +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> > > Who did the backport of this patch in Buildroot? It should carry the > Signed-off-by from the person who did this backport. I don't know if > it's you or Sébastien Szymanski. I am the one guilty. Sigh. > > Also, another question: I assume that if OpenGL is available, Qt Quick > will use it. How does it detect that OpenGL is available? > qt5declarative depends on qt5base. If mesa3d is configured, qt5base depends on mesa3d and is told to build with opengl. Then, we leave buildroot. qt5base build will try to find various incarnations of opengl through its own build tests. qt5base and qt5declarative use the result of those config tests through qtConfig() to see if opengl is available. If you build qt5base you can see config.log and the actual tests under config.tests/ in the build_dir. Now, you can still build QT with opengl support, and still opt to not use it and instead use the software renderer at runtime with the environment variable QMLSCENE_DEVICE=softwarecontext. This patch is all about not making opengl a requirement, where it is not. Josh
Hello, On Thu, 2 Nov 2017 16:06:12 -0700, Joshua Henderson wrote: > > Who did the backport of this patch in Buildroot? It should carry the > > Signed-off-by from the person who did this backport. I don't know if > > it's you or Sébastien Szymanski. > > I am the one guilty. Sigh. Thanks, seen your v5, looks good. > qt5declarative depends on qt5base. If mesa3d is configured, qt5base depends > on mesa3d and is told to build with opengl. Then, we leave buildroot. qt5base > build will try to find various incarnations of opengl through its own build > tests. qt5base and qt5declarative use the result of those config tests > through qtConfig() to see if opengl is available. If you build qt5base you > can see config.log and the actual tests under config.tests/ in the build_dir. > > Now, you can still build QT with opengl support, and still opt to not use it > and instead use the software renderer at runtime with the environment variable > QMLSCENE_DEVICE=softwarecontext. This patch is all about not making opengl a > requirement, where it is not. Thanks for the extended explanation! I'll apply your v5. Thanks! Thomas
diff --git a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch index 875634f..7959d38 100644 --- a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch +++ b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch @@ -34,6 +34,12 @@ Fixes: Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- + +Note: +An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for +backporting to this version due to license differences. + +--- examples/quick/quick.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch new file mode 100644 index 0000000..aca93be --- /dev/null +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch @@ -0,0 +1,29 @@ +From fa52bb665d6beb77a951c14c8edcba3541850afc Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Mon, 25 Sep 2017 16:53:24 +0200 +Subject: [PATCH] Fix no-opengl builds + +The qquickwidgets examples uses OpenGL directly + +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> +--- + examples/quick/quick.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro +index 445dfb0..7da255e 100644 +--- a/examples/quick/quick.pro ++++ b/examples/quick/quick.pro +@@ -36,7 +36,7 @@ qtConfig(opengl(es1|es2)?) { + # Widget dependent examples + qtHaveModule(widgets) { + SUBDIRS += embeddedinwidgets +- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets ++ qtHaveModule(quickwidgets):qtConfig(opengl(es1|es2)?): SUBDIRS += quickwidgets + } + + EXAMPLE_FILES = \ +-- +2.7.4 + diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 5384b5f..3a353a8 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - select BR2_PACKAGE_QT5BASE_OPENGL + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE endif diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 835142e..6df96bc 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -61,7 +61,8 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +# this is only built with quick/opengl support enabled +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) define QT5MULTIMEDIA_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ endef diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 3cc5821..59f6ca4 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://doc.qt.io/qt-5/qtquickcontrols-index.html comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1066b17..d036f74 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 https://doc.qt.io/qt-5/qtquickcontrols2-index.html comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in index a685815..f0e4f03 100644 --- a/package/qt5/qt5virtualkeyboard/Config.in +++ b/package/qt5/qt5virtualkeyboard/Config.in @@ -1,13 +1,13 @@ comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_VERSION_LATEST || !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST config BR2_PACKAGE_QT5VIRTUALKEYBOARD bool "qt5virtualkeyboard" # needs at least Qt 5.7 depends on BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5SVG