CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minizip usage in qtwebengine

Browse Source 
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 9c2b02aab6)
This commit is contained in:
Michal Klocek 2022-05-25 12:28:37 +02:00 committed by Mikko Gronoff
parent cf01e7bf3c
commit 8468dd9b99
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
recipes-core/minizip/minizip_1.2.11.bb Normal file
View File

@ -0,0 +1,21 @@
SUMMARY = "Minizip Compression Library"
DESCRIPTION = "Minizip is a part of Zlib, which is a general-purpose, patent-free, lossless data compression \
library which is used by many different programs."
HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
SECTION = "libs"
LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
UPSTREAM_CHECK_URI = "http://zlib.net/"
S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
DEPENDS = "zlib"
inherit autotools
BBCLASSEXTEND = "native nativesdk"

3
recipes-qt/qt6/qtwebengine_git.bb
View File

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