diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL index 3db6e31e601..d4a33494652 100644 --- a/ports/qt5-webengine/CONTROL +++ b/ports/qt5-webengine/CONTROL @@ -1,5 +1,5 @@ Source: qt5-webengine Version: 5.12.8 Description: Qt5 webengine Module; -Build-Depends: qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel +Build-Depends: qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows) Supports: !static diff --git a/ports/qt5-webengine/common.pri.latest.patch b/ports/qt5-webengine/common.pri.latest.patch new file mode 100644 index 00000000000..ad58ab9e14a --- /dev/null +++ b/ports/qt5-webengine/common.pri.latest.patch @@ -0,0 +1,12 @@ +diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d39535c..dc09da43a 100644 +--- a/src/buildtools/config/common.pri ++++ b/src/buildtools/config/common.pri +@@ -57,5 +57,5 @@ + precompile_header { +- gn_args += enable_precompiled_headers=true ++ gn_args += enable_precompiled_headers=false + } else { + gn_args += enable_precompiled_headers=false + } diff --git a/ports/qt5-webengine/gl.latest.patch b/ports/qt5-webengine/gl.latest.patch new file mode 100644 index 00000000000..a48ddf6c302 --- /dev/null +++ b/ports/qt5-webengine/gl.latest.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h +index d54583e8b..1921185f8 100644 +--- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h ++++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h +@@ -16,7 +16,7 @@ + namespace gl { + + class GLContext; +- ++typedef void *GLeglImageOES; + typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline, + GLuint program); + typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture); diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index e9e4e2cefaa..d7fd4b053b9 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -10,6 +10,8 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) endif() include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + + vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(GPERF) @@ -19,7 +21,7 @@ get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) -get_filename_component(NINJA_DIR "${GPERF}" DIRECTORY ) +get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY ) if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -36,6 +38,14 @@ vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") -qt_submodule_installation(PATCHES - common.pri.patch - gl.patch) \ No newline at end of file +if(QT_MAJOR_MINOR_VER STREQUAL "5.14") + set(PATCHES common.pri.latest.patch gl.latest.patch) +else() + set(PATCHES common.pri.patch gl.patch) +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu") +endif() + +qt_submodule_installation(${CORE_OPTIONS} PATCHES ${PATCHES})