summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5multimedia
diff options
context:
space:
mode:
authorJoshua Henderson <joshua.henderson@microchip.com>2017-11-02 17:01:24 -0700
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 23:12:01 +0100
commit5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc (patch)
tree0721e153b7780bdaba6d205743c830b6c8c89683 /package/qt5/qt5multimedia
parent80d22997334b0ad76f488913e1159b922804c579 (diff)
downloadbuildroot-5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc.tar.gz
buildroot-5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc.zip
qt5: remove Qt Quick dependency on opengl
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>
Diffstat (limited to 'package/qt5/qt5multimedia')
-rw-r--r--package/qt5/qt5multimedia/qt5multimedia.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 835142e3a4..6df96bcab4 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
OpenPOWER on IntegriCloud