diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-04-24 06:19:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 21:19:45 -0700 |
| commit | bb7ccc4b90d68c62c0b120f12fed654b7768fced (patch) | |
| tree | 2ffebf39c541d3344b15ef682c1d8bfe05438643 /ports/qt5-webengine | |
| parent | ed9511fcf6d6fd6ab1358db7d19b5fee7cbda05c (diff) | |
| download | vcpkg-bb7ccc4b90d68c62c0b120f12fed654b7768fced.tar.gz vcpkg-bb7ccc4b90d68c62c0b120f12fed654b7768fced.zip | |
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules
* fix control
* qt5 webengine enviromnent setup
* copy qtminimal plugin to tools
* add opengles3 option for testing
* [qt5-imageformats] freeglut is not a dependency on osx
* [qt5-base] fontconfig can require iconv on linux and osx
* include the jasper fix to get CI coverage?
* trying to get ci coverage for qt on osx
* Revert "trying to get ci coverage for qt on osx"
This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b.
* apply the correct ci hack
* fix wrapper to include macosx debug suffix
* update baseline
* first try to fix the Qt5 cmake configs at the root.
* fix missing backslash
* fix plugin patch
* fix qt config patch
* remove 90% of fixcmake.py
* update baseline
* experimental removal of fixcmake.py and dll copying into tools/qt5/bin
* fix experimental dll copying.
* fix static windows builds
* fix static builds
* fix plugin copy
* add quotes around configuration to make it work
* remove dll debug messages
* note about the cmake fix
* revert fontconfig changes on linux. Make qt.conf relative and not absolute
* make qt.conf relative
* trying to fix ogre osx ci regression
* fix silly path error
* Revert "trying to fix ogre osx ci regression"
This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c.
* add ogre:x64-osx=fail to CI baseline
* retry on osx
* fix configure error. since in qt5-base everything is in the package directory and not in the installed
* revert change to ci.baseline
* update ci baseline
* update Qt Control fields
* update qt hashes to 5.12.7
* update baseline
update missing hashes
update empty include/packages
add info for placeholder ports not yet correctly working (e.g. qt5-wayland)
* fix linux qt targets not having debug properties.
* remove most of the wrapper
* actual forgot to commit the prl parser
* fix the config a bit differently. have to check linux configs again
* add xlib patch.
* make qt-base fail to get logs on linux
* Need logs from qt5-base
* update versions I missed
* ws change
* lets see if this is enough to make qt5-x11extras happy
* add upstream patch.
* add newline to patch
* ws change to trigger rebuild and maybe get logs on osx failure
* need generated cmakescripts to check linkage.
* rename cmake files to end on .log so that i can inspect them after CI failure
* fix patch
* make qt run
* androidextras only supports android
* qt5-doc will only be build on linux
* ws ci trigger due to download failure
* WS to retrigger CI due to download failure
* add code for debug tools
* lets see if we can do it with only the release tools
* update baseline
* fix create link error on linx
* update baseline
* revert changes which tried to use release tools only
* fix dependencies
* add debug qt.conf
* add another copyright install
* qtdoc does not have any include files
* fix wrong copy pasta
* update latest port hashes.
* make the patches versions dependent
* cleanup qt5 control a bit
* update qt5-base control for ci run to use latest
* fix patches for latest
* forgot to commit the portfile changes
* fix imageformat dependencies for latest qt
* update last hash
* fix translations dependencies
* get cmake scripts from CI
* new patch for creating correct configs
* patch precompiled headers away from qt5-webengine
* fix patch for 5.12.7. (Patch was for 5.14.1)
* trigger CI rebuild
* add simple gl path to fix the chormium build error
* comment out debug message from prl parser
* bump control
* update webengine control
* update CI to skip webengine.
* update baseline
* ws change to osg-qt
* remove kd-soap from faillist
* reset ci baseline to upstream/master
* update baseline
* fix osg-qt?
* skip ms-angle on osx and linux since the normal angle port should be used!
* update ci baseline
* try adding fontconfig manually
* update ci baseline to remove osg-qt for the time being
* remove manual library.
* remove wrapper and get plugin info also from linux and osx
* allow build of complete qt
* fix missing parameter in populate plugin.
* need more info from CI
* fix foreach CI loop
* comment out CI code colllection to make a full qt5 ci run
* fix qt5-imageformats regression on linux
* update baseline
* - add patch to find the debug library
- manually fix EGL path in Qt5GuiConfigExtras.cmake
* bump control
* update hashes to 5.14.2
* comment out messages for debugging
* bump version in control
* fix create cmake patch
* add qtmain path corrections for single configuration build.
* fix escaping of . in regex
* remove one to many \\
* remove latest as a default feature
* reenable messages to debug osg-qt issue on osx.
* small cmake options details.
might need to patch cmakelists.txt if this is not working
* remove unnecessary comment
* make prl parser silent again.
* remove canvas3d from the default features since it has been deprecated and will be removed in the future
* remove ws change
* remove newline and ws
* trigger ci test
* revert 199a3ef92f83775a61bd0f9beee0c48698bff1b6
* add messages to qt5-webengine and adjust baseline
* add jpeg and zlib to JASPER_LIBS
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'ports/qt5-webengine')
| -rw-r--r-- | ports/qt5-webengine/CONTROL | 5 | ||||
| -rw-r--r-- | ports/qt5-webengine/common.pri.patch | 12 | ||||
| -rw-r--r-- | ports/qt5-webengine/gl.patch | 13 | ||||
| -rw-r--r-- | ports/qt5-webengine/portfile.cmake | 41 |
4 files changed, 71 insertions, 0 deletions
diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL new file mode 100644 index 000000000..cf5955c05 --- /dev/null +++ b/ports/qt5-webengine/CONTROL @@ -0,0 +1,5 @@ +Source: qt5-webengine
+Version: 5.12.7-1
+Description: Qt5 webengine Module;
+Build-Depends: qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel
+Supports: !static
diff --git a/ports/qt5-webengine/common.pri.patch b/ports/qt5-webengine/common.pri.patch new file mode 100644 index 000000000..0af081035 --- /dev/null +++ b/ports/qt5-webengine/common.pri.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/config/common.pri b/src/core/config/common.pri +#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d39535c..dc09da43a 100644 +--- a/src/core/config/common.pri ++++ b/src/core/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.patch b/ports/qt5-webengine/gl.patch new file mode 100644 index 000000000..e581113e0 --- /dev/null +++ b/ports/qt5-webengine/gl.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* glActiveTextureProc)(GLenum texture); + typedef void(GL_BINDING_CALL* glApplyFramebufferAttachmentCMAAINTELProc)(void); + typedef void(GL_BINDING_CALL* glAttachShaderProc)(GLuint program, diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake new file mode 100644 index 000000000..e9e4e2cef --- /dev/null +++ b/ports/qt5-webengine/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +#set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements +message(STATUS "${PORT} requires a lot of free disk space (>300GB), ram (>32 GB) and time (>4h per configuration) to be successfully build.\n\ +-- As such ${PORT} is not properly tested.\n\ +-- If ${PORT} fails post build validation please open up an issue. \n\ +-- If it fails due to post validation the successfully installed files can be found in <vcpkgroot>/packages/${PORT}_${TARGET_TRIPLET} \n\ +-- and just need to be copied into <vcpkgroot>/installed/${TARGaET_TRIPLET}") +if(NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n") +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) +vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(NINJA) +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 ) + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() +endif() + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") +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 |
