diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-05-25 12:28:37 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-11-09 20:45:31 +0200 |
| commit | 8468dd9b99f4de5cb13732ec9c28cfd292c44e36 (patch) | |
| tree | 0dff08dbd8d3a45eed1825acbe5e3f8b6f9e74f7 /recipes-qt | |
| parent | cf01e7bf3c1aaab59b0bd7c36087d2a7ae6b5a10 (diff) | |
Fix minizip usage in qtwebengine
WebEngine needs minizip which is part of zlib.Till now it always built
bundled zip as minizip recipe does not exist in poky and moreover this
was never a configurable feature as it was not in PACKAGECONFIG.
A change in https://codereview.qt-project.org/c/qt/qtwebengine/+/384262
enables compilation of bundled minizip against system zlib (by using
shim headers) however it is not advisable as those two version of zip
might be different and minizip is project wise a part of zlib.
Therefore introduce cheap rip off of zlib recipe, however
building minizip from same source tree.
Task-number: QTBUG-103149
Change-Id: I1e36d2fba339fb5383018f05a6347c27dde0c8c1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 9c2b02aab650137fd8c0febaecbc6d593ffb3d02)
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt6/qtwebengine_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index 23934f9..f38bd58 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -61,7 +61,6 @@ PACKAGECONFIG[libpng] = "-DFEATURE_webengine_system_libpng=ON,-DFEATURE_webengin PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengine_system_libvpx=OFF,libvpx" PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp" PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengine_system_libxml=OFF,libxml2 libxslt" -PACKAGECONFIG[minizip] = "-DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_minizip=OFF,minizip" PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus" PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils" PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF" @@ -74,7 +73,7 @@ PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_web PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel" PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx" PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0" -PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON,-DFEATURE_webengine_system_zlib=OFF,zlib" +PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip" FILES:${PN} += "\ ${QT6_INSTALL_TRANSLATIONSDIR} \ |