diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-03-30 19:56:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 10:56:00 -0700 |
| commit | ed54efbb16ae8a457296c7a7e1462a9f54571e94 (patch) | |
| tree | d63bee454a5dda6d8fa7c2c41dac5cec4306299d | |
| parent | a434cc74ea515e6612bcb66d8f4ab69bbb8c62bf (diff) | |
| download | vcpkg-ed54efbb16ae8a457296c7a7e1462a9f54571e94.tar.gz vcpkg-ed54efbb16ae8a457296c7a7e1462a9f54571e94.zip | |
[qt5-webengine] Fix issues (#16770)
* [qt5-webengine]
- add feature "proprietary-codecs"
- fix build error due to internal changes how options are passed.
- try to fail early on too long build paths instead of late
* comment the ci baseline for x64-windows to actually test it in ci
and only build one configuration to not overstress the ci system
* be less strict about the buildtree path length
* adjust qt5-webengine ci back
* update baseline
* change length error message according to CR.
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* fix version
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/qt5-webengine/CONTROL | 6 | ||||
| -rw-r--r-- | ports/qt5-webengine/portfile.cmake | 17 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-webengine.json | 5 |
4 files changed, 24 insertions, 6 deletions
diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL index 929a7ad64..a34cdc1ec 100644 --- a/ports/qt5-webengine/CONTROL +++ b/ports/qt5-webengine/CONTROL @@ -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
\ No newline at end of file diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 797d5fedb..60020c83f 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -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}") @@ -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}) diff --git a/versions/baseline.json b/versions/baseline.json index c984e3c4d..bbe16fdf8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5058,7 +5058,7 @@ }, "qt5-webengine": { "baseline": "5.15.2", - "port-version": 1 + "port-version": 2 }, "qt5-webglplugin": { "baseline": "5.15.2", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 08757c6e6..d3382ca07 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3a220ca2fe835251196c717e4f1df91516430d8b", + "version-string": "5.15.2", + "port-version": 2 + }, + { "git-tree": "8f8f6defb09c499cfe581195f03e88951431d73c", "version-string": "5.15.2", "port-version": 1 |