Skip to contentSkip to conversation

minizip-ng: Add new recipe

PATCH Superseded [email protected] 1 participant 2 messages Mar 21, 2025

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 minizip-ng: Add new recipe

From: Mingli Yu <[email protected]>

minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.

minizip-ng has new features and bug fixes compared to the original library minizip [1] which had not been maintained for a long period of time.

[1] https://github.com/madler/zlib/tree/master/contrib/minizip

---
 .../minizip-ng/minizip-ng_4.0.8.bb            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb new file +32 -0
new file mode 100644
index 0000000000..19dc16cb67
@@ -0,0 +1,32 @@
+SUMMARY = "Zlib manipulation Library"
+DESCRIPTION = "minizip-ng is a zip manipulation library written in C that is supported \
+on Windows, macOS, and Linux."
+HOMEPAGE = "https://github.com/zlib-ng/minizip-ng"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f"
+
+SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master"
+
+SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "xz openssl bzip2"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \
+                 -DBUILD_SHARED_LIBS=ON \
+"
+
+PACKAGECONFIG ??= "zlib"
+PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib"
+PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng"
+
+
+do_install:append () {
+    # remove absolute paths
+    sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake
+}
+
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 minizip-ng: Add ptest support

From: Mingli Yu <[email protected]>

 # ./run-ptest
[==========] Running 55 tests from 6 test suites.
[----------] Global test environment set-up.
[----------] 22 tests from crypt
PASS:  crypt.rand
PASS:  crypt.sha1
PASS:  crypt.sha224
PASS:  crypt.sha256
PASS:  crypt.sha384
PASS:  crypt.sha512
PASS:  crypt.aes128
PASS:  crypt.aes128_cbc
PASS:  crypt.aes128_gcm
PASS:  crypt.aes194
PASS:  crypt.aes256
PASS:  crypt.hmac_sha1
PASS:  crypt.hmac_sha1_short_password
PASS:  crypt.hmac_sha256
PASS:  crypt.pbkdf2
PASS:  crypt.pbkdf2_long_odd_password
PASS:  crypt.pbkdf2_short_password
PASS:  crypt.pbkdf2_rfc6070_v1
PASS:  crypt.pbkdf2_rfc6070_v2
PASS:  crypt.pbkdf2_rfc6070_v3
PASS:  crypt.pbkdf2_rfc6070_v4
PASS:  crypt.pbkdf2_rfc6070_v5
[----------] 1 test from os
PASS:  os.utf8_unicode_string
[----------] 2 tests from encrypt
PASS:  encrypt.pkcrypt
PASS:  encrypt.aes
[----------] 2 tests from stream
bzip compressed from 877 to 505
bzip uncompressed from 505 to 877
PASS:  stream.bzip
lzma compressed from 877 to 526
lzma uncompressed from 526 to 877
PASS:  stream.lzma
[----------] 20 tests from os/path_resolve
PASS:  os/path_resolve.os/0
PASS:  os/path_resolve.os/1
PASS:  os/path_resolve.os/2
PASS:  os/path_resolve.os/3
PASS:  os/path_resolve.os/4
PASS:  os/path_resolve.os/5
PASS:  os/path_resolve.os/6
PASS:  os/path_resolve.os/7
PASS:  os/path_resolve.os/8
PASS:  os/path_resolve.os/9
PASS:  os/path_resolve.os/10
PASS:  os/path_resolve.os/11
PASS:  os/path_resolve.os/12
PASS:  os/path_resolve.os/13
PASS:  os/path_resolve.os/14
PASS:  os/path_resolve.os/15
PASS:  os/path_resolve.os/16
PASS:  os/path_resolve.os/17
PASS:  os/path_resolve.os/18
PASS:  os/path_resolve.os/19
[----------] 8 tests from stream/stream_find
PASS:  stream/stream_find.find/0
PASS:  stream/stream_find.find/1
PASS:  stream/stream_find.find/2
PASS:  stream/stream_find.find/3
PASS:  stream/stream_find.find/4
PASS:  stream/stream_find.find/5
PASS:  stream/stream_find.find/6
PASS:  stream/stream_find.find/7
[----------] Global test environment tear-down
[==========] 55 tests from 6 test suites ran.
[  PASSED  ] 55 tests.
---
 .../recipes-core/minizip-ng/minizip-ng/run-ptest |  3 +++
 .../recipes-core/minizip-ng/minizip-ng_4.0.8.bb  | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest
meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest new file +3 -0
new file mode 100644
index 0000000000..9c2dc81e35
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd tests && ./gtest_minizip --gtest_print_time=0 | sed -E  '/^\[ RUN/d ; s/\[       OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /'
meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +13 -3
index 19dc16cb67..ffc46a2f06 100644
@@ -6,7 +6,9 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f"
 
-SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \
+           file://run-ptest \
+"
 
 SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de"
 
@@ -14,15 +16,16 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "xz openssl bzip2"
 
-inherit cmake pkgconfig
+inherit cmake pkgconfig ptest
 
 EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \
                  -DBUILD_SHARED_LIBS=ON \
 "
 
-PACKAGECONFIG ??= "zlib"
+PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}"
 PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib"
 PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng"
+PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest"
 
 
 do_install:append () {
@@ -30,3 +33,10 @@ do_install:append () {
     sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake
 }
 
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests
+    # encrypt and stream test need the LICENSE file
+    cp ${S}/LICENSE ${D}${PTEST_PATH}/tests
+}
+
Signature · 1 line
2.34.1