* [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package
@ 2022-07-27 15:10 Fabrice Fontaine
2022-07-27 15:10 ` [Buildroot] [PATCH v2,2/2] package/domoticz: selects minizip-zlib Fabrice Fontaine
2022-08-01 19:59 ` [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Thomas Petazzoni via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-07-27 15:10 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni
Legacy minizip provided in contrib/minizip of zlib.
https://www.winimage.com/zLibDll/minizip.html
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Arnout Vandecappelle):
- Drop virtual-package
DEVELOPERS | 1 +
package/Config.in | 1 +
package/minizip-zlib/Config.in | 7 +++++++
package/minizip-zlib/minizip-zlib.hash | 4 ++++
package/minizip-zlib/minizip-zlib.mk | 20 ++++++++++++++++++++
5 files changed, 33 insertions(+)
create mode 100644 package/minizip-zlib/Config.in
create mode 100644 package/minizip-zlib/minizip-zlib.hash
create mode 100644 package/minizip-zlib/minizip-zlib.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 3645a22fea..1e55f8e90c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -958,6 +958,7 @@ F: package/mbedtls/
F: package/mbedtls3/
F: package/minissdpd/
F: package/minizip/
+F: package/minizip-zlib/
F: package/mongodb/
F: package/motion/
F: package/mutt/
diff --git a/package/Config.in b/package/Config.in
index 654990ab97..a2ab473940 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1401,6 +1401,7 @@ menu "Compression and decompression"
source "package/lz4/Config.in"
source "package/lzo/Config.in"
source "package/minizip/Config.in"
+ source "package/minizip-zlib/Config.in"
source "package/snappy/Config.in"
source "package/szip/Config.in"
source "package/zchunk/Config.in"
diff --git a/package/minizip-zlib/Config.in b/package/minizip-zlib/Config.in
new file mode 100644
index 0000000000..fe9b337a86
--- /dev/null
+++ b/package/minizip-zlib/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MINIZIP_ZLIB
+ bool "minizip-zlib"
+ select BR2_PACKAGE_ZLIB
+ help
+ Legacy minizip provided in contrib/minizip of zlib.
+
+ https://www.winimage.com/zLibDll/minizip.html
diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash
new file mode 100644
index 0000000000..4d2c5c29d3
--- /dev/null
+++ b/package/minizip-zlib/minizip-zlib.hash
@@ -0,0 +1,4 @@
+# From http://www.zlib.net/
+sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz
+# License files, locally calculated
+sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README
diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk
new file mode 100644
index 0000000000..935877678d
--- /dev/null
+++ b/package/minizip-zlib/minizip-zlib.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# minizip-zlib
+#
+################################################################################
+
+MINIZIP_ZLIB_VERSION = 1.2.11
+MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz
+MINIZIP_ZLIB_SITE = http://www.zlib.net
+MINIZIP_ZLIB_LICENSE = Zlib
+MINIZIP_ZLIB_LICENSE_FILES = README
+MINIZIP_ZLIB_INSTALL_STAGING = YES
+MINIZIP_ZLIB_SUBDIR = contrib/minizip
+# configure is not shipped in contrib/minizip
+MINIZIP_ZLIB_AUTORECONF = YES
+MINIZIP_ZLIB_DEPENDENCIES = zlib
+# demos must be disabled to avoid a conflict with BR2_PACKAGE_MINIZIP_DEMOS
+MINIZIP_ZLIB_CONF_OPTS = --disable-demos
+
+$(eval $(autotools-package))
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2,2/2] package/domoticz: selects minizip-zlib
2022-07-27 15:10 [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Fabrice Fontaine
@ 2022-07-27 15:10 ` Fabrice Fontaine
2022-08-01 19:59 ` [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-07-27 15:10 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni
Selects minizip-zlib and so drop git submodules
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/domoticz/Config.in | 1 +
package/domoticz/domoticz.hash | 2 +-
package/domoticz/domoticz.mk | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in
index 4324d13cee..85361eecf0 100644
--- a/package/domoticz/Config.in
+++ b/package/domoticz/Config.in
@@ -19,6 +19,7 @@ config BR2_PACKAGE_DOMOTICZ
select BR2_PACKAGE_FMT
select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_MINIZIP_ZLIB
select BR2_PACKAGE_MOSQUITTO
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_SQLITE
diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash
index 18bf57b7e0..9de241015c 100644
--- a/package/domoticz/domoticz.hash
+++ b/package/domoticz/domoticz.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz
+sha256 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157 domoticz-2022.1.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt
diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index 5edc10e8d8..f21c52d432 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -5,9 +5,7 @@
################################################################################
DOMOTICZ_VERSION = 2022.1
-DOMOTICZ_SITE = https://github.com/domoticz/domoticz
-DOMOTICZ_SITE_METHOD = git
-DOMOTICZ_GIT_SUBMODULES = YES
+DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
DOMOTICZ_LICENSE = GPL-3.0
DOMOTICZ_LICENSE_FILES = License.txt
DOMOTICZ_CPE_ID_VENDOR = domoticz
@@ -19,6 +17,7 @@ DOMOTICZ_DEPENDENCIES = \
jsoncpp \
libcurl \
lua \
+ minizip \
mosquitto \
openssl \
sqlite \
@@ -34,10 +33,11 @@ DOMOTICZ_CONF_OPTS += \
-DUSE_OPENSSL_STATIC=OFF
# Do not use any built-in libraries which are enabled by default for
-# jsoncpp, fmt, sqlite and mqtt
+# jsoncpp, fmt, minizip, sqlite and mqtt
DOMOTICZ_CONF_OPTS += \
-DUSE_BUILTIN_JSONCPP=OFF \
-DUSE_BUILTIN_LIBFMT=OFF \
+ -DUSE_BUILTIN_MINIZIP=OFF \
-DUSE_BUILTIN_SQLITE=OFF \
-DUSE_BUILTIN_MQTT=OFF
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package
2022-07-27 15:10 [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Fabrice Fontaine
2022-07-27 15:10 ` [Buildroot] [PATCH v2,2/2] package/domoticz: selects minizip-zlib Fabrice Fontaine
@ 2022-08-01 19:59 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-01 19:59 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
On Wed, 27 Jul 2022 17:10:36 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Legacy minizip provided in contrib/minizip of zlib.
>
> https://www.winimage.com/zLibDll/minizip.html
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Arnout Vandecappelle):
> - Drop virtual-package
Both applied, thanks!
It is somewhat confusing that our package called minizip install
libminizip-ng.so, and our package named minizip-zlib installs
libminizip.so, but oh well.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-01 19:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-27 15:10 [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Fabrice Fontaine
2022-07-27 15:10 ` [Buildroot] [PATCH v2,2/2] package/domoticz: selects minizip-zlib Fabrice Fontaine
2022-08-01 19:59 ` [Buildroot] [PATCH v2,1/2] package/minizip-zlib: new package Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox