package/minizip: bump to version 2.10.5
PATCH 1/1 package/minizip: bump to version 2.10.5
- Drop patches (already in version)
- Set MZ_FETCH_LIBS to OFF (available since version 2.10.5 and
https://github.com/nmoinvaz/minizip/commit/a1602ed9c82c6b2dd5ea8753dd3fecc3dcc74ba5)
- Use MZ_ICONV which is available since version 2.10.4 and
https://github.com/nmoinvaz/minizip/commit/628830ff93c2fb1fd1bbb87ccea5857c5caf2af4
- Add xz optional dependency which is available since version 2.10.2 and
https://github.com/nmoinvaz/minizip/commit/f1cc0e3898b23828765378b2ab6ba7622d1f8dbe
https://github.com/nmoinvaz/minizip/releases/tag/2.10.5
https://github.com/nmoinvaz/minizip/releases/tag/2.10.4
https://github.com/nmoinvaz/minizip/releases/tag/2.10.3
https://github.com/nmoinvaz/minizip/releases/tag/2.10.2
https://github.com/nmoinvaz/minizip/releases/tag/2.10.1
--- .../0001-Use-pkg-config-to-find-ZSTD.patch | 30 ---------- .../0002-mz.h-fix-build-with-gcc-4.8.patch | 60 ------------------- package/minizip/minizip.hash | 2 +- package/minizip/minizip.mk | 23 +++++-- 4 files changed, 19 insertions(+), 96 deletions(-) delete mode 100644 package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch delete mode 100644 package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch
package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 69afd09aee3727f2804e1b063ef50800b22c6bb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= <[email protected]> -Date: Wed, 1 Jul 2020 11:18:08 +0200 -Subject: [PATCH] Use pkg-config to find ZSTD - -[Retrieved from: https://github.com/nmoinvaz/minizip/pull/509] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6deb4ce..987e7947 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,13 @@ endif() - # Check if zstd installation is present - if(MZ_ZSTD) - if(NOT ZSTD_FORCE_FETCH) -- find_package(ZSTD QUIET) -+ find_package(PkgConfig) -+ if(PKGCONFIG_FOUND) -+ pkg_check_modules(ZSTD libzstd) -+ endif() -+ if(NOT ZSTD_FOUND) -+ find_package(ZSTD QUIET) -+ endif() - endif() - if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH) - message(STATUS "Using ZSTD")
package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch deleted +0 -60
60 lines not on this page · raw message
package/minizip/minizip.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 4c7f236268fef57ce5dcbd9645235a22890d62480a592e1b0515ecff93f9989b minizip-2.10.0.tar.gz +sha256 1c6420d3f3509e722178d9130a57cb77537b34900e7b67acca7e3e2858846939 minizip-2.10.5.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE
package/minizip/minizip.mk +18 -5
@@ -4,15 +4,14 @@ # ################################################################################ -MINIZIP_VERSION = 2.10.0 +MINIZIP_VERSION = 2.10.5 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = \ - host-pkgconf \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) +MINIZIP_DEPENDENCIES = host-pkgconf MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ - -DMZ_COMPAT=OFF + -DMZ_COMPAT=OFF \ + -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE
@@ -23,6 +22,13 @@ else MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIZIP_DEPENDENCIES += libiconv +MINIZIP_CONF_OPTS += -DMZ_ICONV=ON +else +MINIZIP_CONF_OPTS += -DMZ_ICONV=OFF +endif + ifeq ($(BR2_PACKAGE_LIBBSD),y) MINIZIP_DEPENDENCIES += libbsd MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON
@@ -37,6 +43,13 @@ else MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF endif +ifeq ($(BR2_PACKAGE_XZ),y) +MINIZIP_DEPENDENCIES += xz +MINIZIP_CONF_OPTS += -DMZ_LZMA=ON +else +MINIZIP_CONF_OPTS += -DMZ_LZMA=OFF +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) MINIZIP_DEPENDENCIES += zlib MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON
Signature · 1 line
2.29.2
PATCH 1/1 package/minizip: bump to version 2.10.5
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Drop patches (already in version)
- SetMZ_FETCH_LIBSto OFF (available since version 2.10.5 and
https://github.com/nmoinvaz/minizip/commit/a1602ed9c82c6b2dd5ea8753dd3fecc3dcc74ba5)
- UseMZ_ICONVwhich is available since version 2.10.4 and
https://github.com/nmoinvaz/minizip/commit/628830ff93c2fb1fd1bbb87ccea5857c5caf2af4
- Add xz optional dependency which is available since version 2.10.2 and
https://github.com/nmoinvaz/minizip/commit/f1cc0e3898b23828765378b2ab6ba7622d1f8dbe
Quoted 7 lines
https://github.com/nmoinvaz/minizip/releases/tag/2.10.5
https://github.com/nmoinvaz/minizip/releases/tag/2.10.4
https://github.com/nmoinvaz/minizip/releases/tag/2.10.3
https://github.com/nmoinvaz/minizip/releases/tag/2.10.2
https://github.com/nmoinvaz/minizip/releases/tag/2.10.1Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard