From 8468dd9b99f4de5cb13732ec9c28cfd292c44e36 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 25 May 2022 12:28:37 +0200 Subject: [PATCH] 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 (cherry picked from commit 9c2b02aab650137fd8c0febaecbc6d593ffb3d02) --- recipes-core/minizip/minizip_1.2.11.bb | 21 +++++++++++++++++++++ recipes-qt/qt6/qtwebengine_git.bb | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 recipes-core/minizip/minizip_1.2.11.bb diff --git a/recipes-core/minizip/minizip_1.2.11.bb b/recipes-core/minizip/minizip_1.2.11.bb new file mode 100644 index 0000000..5fd004b --- /dev/null +++ b/recipes-core/minizip/minizip_1.2.11.bb @@ -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" 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} \