jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt5: remove Qt Quick dependency on opengl

Browse Source 
Qt Quick should no longer depend on opengl, and instead fallback to
the limited functionality software renderer as a replacement [1] when
not available.

[1] http://blog.qt.io/blog/2016/08/15/the-qt-quick-graphics-stack-in-qt-5-8/

Cc: Peter Seiderer <ps.report@gmx.net>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Tested-by: Peter Seiderer <ps.report@gmx.net>
[Thomas: drop qt5declarative patch, since we have bumped to 5.9.3,
which contains the patch.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Joshua Henderson 2017-11-02 17:01:24 -07:00 committed by Thomas Petazzoni
parent 80d2299733
commit 5eb43c83c1
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
View File

@ -33,6 +33,12 @@ Fixes:
.obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject' .obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject'
Signed-off-by: Peter Seiderer <ps.report@gmx.net> 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 ++++- examples/quick/quick.pro | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)

6
package/qt5/qt5declarative/Config.in
View File

@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE
if BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE
comment "quick module needs an OpenGL-capable backend" 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 config BR2_PACKAGE_QT5DECLARATIVE_QUICK
bool "quick module" bool "quick module"
depends on BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
select BR2_PACKAGE_QT5BASE_OPENGL select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
endif endif

3
package/qt5/qt5multimedia/qt5multimedia.mk
View File

@ -61,7 +61,8 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
endef endef
endif 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 define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
endef endef

4
package/qt5/qt5quickcontrols/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_QT5QUICKCONTROLS config BR2_PACKAGE_QT5QUICKCONTROLS
bool "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 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5DECLARATIVE_QUICK
@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
http://doc.qt.io/qt-5/qtquickcontrols-index.html http://doc.qt.io/qt-5/qtquickcontrols-index.html
comment "qt5quickcontrols needs an OpenGL-capable backend" 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 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

4
package/qt5/qt5quickcontrols2/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_QT5QUICKCONTROLS2 config BR2_PACKAGE_QT5QUICKCONTROLS2
bool "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 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5DECLARATIVE_QUICK
@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
https://doc.qt.io/qt-5/qtquickcontrols2-index.html https://doc.qt.io/qt-5/qtquickcontrols2-index.html
comment "qt5quickcontrols2 needs an OpenGL-capable backend" 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 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

4
package/qt5/qt5virtualkeyboard/Config.in
View File

@ -1,13 +1,13 @@
comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend" comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend"
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE 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 config BR2_PACKAGE_QT5VIRTUALKEYBOARD
bool "qt5virtualkeyboard" bool "qt5virtualkeyboard"
# needs at least Qt 5.7 # needs at least Qt 5.7
depends on BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_VERSION_LATEST
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative 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
select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5DECLARATIVE_QUICK
select BR2_PACKAGE_QT5SVG select BR2_PACKAGE_QT5SVG