diff mbox series

[meta-oe,077/109] minizip-ng: upgrade 4.0.10 -> 4.2.2

Message ID 20260814224539.1523174-77-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,001/109] xorg-docs: upgrade 1.7.2 -> 1.7.3 | expand

Commit Message

Khem Raj Aug. 14, 2026, 10:45 p.m. UTC
Minor release. MZ_PPMD (new default-on feature since 4.2.x) git-clones
ip7z/7zip over the network at configure time via CMake FetchContent;
disabled it, there's no network access in the build sandbox and nothing in
this recipe needs it. do_install:append's post-install sed also needed
retargeting: 4.2.x renamed the generated cmake config file from
minizip.cmake to minizip-config.cmake.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../{minizip-ng_4.0.10.bb => minizip-ng_4.2.2.bb}     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-core/minizip-ng/{minizip-ng_4.0.10.bb => minizip-ng_4.2.2.bb} (73%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.2.2.bb
similarity index 73%
rename from meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb
rename to meta-oe/recipes-core/minizip-ng/minizip-ng_4.2.2.bb
index 2e7f438821..84ab08e981 100644
--- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.2.2.bb
@@ -10,7 +10,7 @@  SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master
            file://run-ptest \
 "
 
-SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd"
+SRCREV = "7b2387161c542fa9f427352dcdef76097d0d692b"
 
 
 RCONFLICTS:${PN} += "minizip"
@@ -19,8 +19,12 @@  DEPENDS = "xz openssl bzip2"
 
 inherit cmake pkgconfig ptest
 
+# MZ_PPMD (new default-on feature since 4.2.x) git-clones ip7z/7zip over the
+# network at configure time via CMake FetchContent; disable it, there's no
+# network access in the build sandbox and nothing in this recipe needs it.
 EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \
                  -DBUILD_SHARED_LIBS=ON \
+                 -DMZ_PPMD=OFF \
 "
 
 PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}"
@@ -30,8 +34,9 @@  PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_
 
 
 do_install:append () {
-    # remove absolute paths
-    sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake
+    # remove absolute paths (4.2.x renamed this generated file from
+    # minizip.cmake to minizip-config.cmake)
+    sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip-config.cmake
 }
 
 do_install_ptest() {