mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 22:10:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt5-webengine] Fix issues (#16770)

Browse Source 
* [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>
This commit is contained in:
Alexander Neumann 2021-03-30 19:56:00 +02:00 committed by GitHub
parent a434cc74ea
commit ed54efbb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/qt5-webengine/CONTROL
View File

@ -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
ports/qt5-webengine/portfile.cmake
View File

@ -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})

2
versions/baseline.json
View File

@ -5058,7 +5058,7 @@
},
"qt5-webengine": {
"baseline": "5.15.2",
"port-version": 1
"port-version": 2
},
"qt5-webglplugin": {
"baseline": "5.15.2",

5
versions/q-/qt5-webengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a220ca2fe835251196c717e4f1df91516430d8b",
"version-string": "5.15.2",
"port-version": 2
},
{
"git-tree": "8f8f6defb09c499cfe581195f03e88951431d73c",
"version-string": "5.15.2",