Skip to content

[qt5-webengine] Fix issues #16770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 8 commits into from
Mar 30, 2021
Merged

[qt5-webengine] Fix issues #16770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d723fc2
[qt5-webengine]
Neumann-A Mar 18, 2021
661e876
comment the ci baseline for x64-windows to actually test it in ci
Neumann-A Mar 18, 2021
da6e6b4
be less strict about the buildtree path length
Neumann-A Mar 18, 2021
9538d51
adjust qt5-webengine ci back
Neumann-A Mar 18, 2021
931b4a1
update baseline
Neumann-A Mar 18, 2021
3f30718
change length error message according to CR.
Neumann-A Mar 26, 2021
bd84a9b
fix version
Neumann-A Mar 26, 2021
94d4bbc
Merge remote-tracking branch 'upstream/master' into fix_qt5-webengine…
Neumann-A Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ports/qt5-webengine/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Source: qt5-webengine
Version: 5.15.2
Port-Version: 1
Port-Version: 2
Description: Qt5 webengine Module;
Build-Depends: qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)
Supports: !static
Default-Features:

Feature: proprietary-codecs
Description: Enable proprietary-codecs in qtwebengine
17 changes: 13 additions & 4 deletions ports/qt5-webengine/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length)
if(buildtrees_path_length GREATER 35 AND CMAKE_HOST_WIN32)
vcpkg_buildpath_length_warning(35)
message(FATAL_ERROR "terminating due to source length.")
endif()
#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\
message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\
-- As such ${PORT} is currently experimental.\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 ${CURRENT_PACKAGES_DIR} \n\
-- and just need to be copied into ${CURRENT_INSTALLED_DIR}")
Expand Down Expand Up @@ -42,8 +47,12 @@ set(PATCHES common.pri.patch
build_2.patch
build_3.patch)

set(OPTIONS)
if("proprietary-codecs" IN_LIST FEATURES)
list(APPEND OPTIONS "-webengine-proprietary-codecs")
endif()
if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
list(APPEND OPTIONS "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
endif()

qt_submodule_installation(${CORE_OPTIONS} PATCHES ${PATCHES})
qt_submodule_installation(PATCHES ${PATCHES} BUILD_OPTIONS ${OPTIONS})
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5026,7 +5026,7 @@
},
"qt5-webengine": {
"baseline": "5.15.2",
"port-version": 1
"port-version": 2
},
"qt5-webglplugin": {
"baseline": "5.15.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-webengine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a220ca2fe835251196c717e4f1df91516430d8b",
"version-string": "5.15.2",
"port-version": 2
},
{
"git-tree": "8f8f6defb09c499cfe581195f03e88951431d73c",
"version-string": "5.15.2",
Expand Down