From ea8579141c1af9e3afc08e1d398e5187a67f38cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 16 Jan 2022 22:49:54 +0100 Subject: [PATCH] package/qt5/qt5webkit: fix build without opengl Fix the following build failure without opengl raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at Source/cmake/OptionsQt.cmake:592 (message): Qt with OpenGL support is required for ENABLE_OPENGL WebKit2 unconditionally depends on TextureMapperGL.h and tools builds QtTestBrowser which unconditionally depends on QtOpenGL Fixes: - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 3af1918a46..de3c428fbe 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=ON \ + -DENABLE_WEBKIT2=ON +else +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBKIT2=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative endif QT5WEBKIT_CONF_OPTS += \ + -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DUSE_LIBHYPHEN=OFF