浏览代码

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 <fontaine.fabrice@gmail.com>
Reviewed-by: James Hilliard <james.hilliard1@gmail.com>
Reviewed-by: Adam Duskett <aduskett@gmail.com>
Tested-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Fabrice Fontaine 3 年之前
父节点
当前提交
ea8579141c
共有 1 个文件被更改,包括 11 次插入0 次删除
  1. 11 0
      package/qt5/qt5webkit/qt5webkit.mk

+ 11 - 0
package/qt5/qt5webkit/qt5webkit.mk

@@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
 # in the archive.
 # in the archive.
 QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
 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)
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender
 QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender
 endif
 endif
@@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative
 endif
 endif
 
 
 QT5WEBKIT_CONF_OPTS += \
 QT5WEBKIT_CONF_OPTS += \
+	-DENABLE_TOOLS=OFF \
 	-DPORT=Qt \
 	-DPORT=Qt \
 	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
 	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
 	-DUSE_LIBHYPHEN=OFF
 	-DUSE_LIBHYPHEN=OFF