From fbbc6ad9d6dac4d4707d1159f666d789107c80ea Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Tue, 10 Oct 2017 19:44:41 -0700
Subject: [PATCH 1/3] zlib: remove building minizip

---
 packages/compress/zlib/package.mk | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index 006a7f30a1..b12439dcf5 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -28,28 +28,4 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="compress"
 PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
 PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
-PKG_AUTORECONF="no"
 PKG_USE_NINJA="no"
-
-post_configure_target() {
- ## configure minizip
- (
-  cd $PKG_BUILD/contrib/minizip
-  rm Makefile
-  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:../../"
-  do_autoreconf
-  cp $PKG_BUILD/.$TARGET_NAME/zconf.h ./
-  ./configure --host=$TARGET_NAME --build=$HOST_NAME $TARGET_CONFIGURE_OPTS --disable-shared --enable-static
- )
-}
-
-post_make_target() {
- # make minizip
- make -C $PKG_BUILD/contrib/minizip
-}
-
-post_makeinstall_target() {
- # Install minizip
- make -C $PKG_BUILD/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
-}
-

From dd77ad2f6c5c762db9b1b5a4d33d6c098aa3f922 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Tue, 10 Oct 2017 19:44:55 -0700
Subject: [PATCH 2/3] minizip: initial package

---
 packages/compress/minizip/package.mk | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 packages/compress/minizip/package.mk

diff --git a/packages/compress/minizip/package.mk b/packages/compress/minizip/package.mk
new file mode 100644
index 0000000000..61994ecb54
--- /dev/null
+++ b/packages/compress/minizip/package.mk
@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="minizip"
+PKG_VERSION="1.1"
+PKG_SHA256="5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1"
+PKG_ARCH="any"
+PKG_LICENSE="zlib"
+PKG_SITE="https://github.com/nmoinvaz/minizip"
+PKG_URL="https://github.com/nmoinvaz/minizip/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="zlib"
+PKG_SECTION="compress"
+PKG_SHORTDESC="Minizip zlib contribution fork with latest bug fixes"
+PKG_LONGDESC="Minizip zlib contribution fork with latest bug fixes"
+
+PKG_CMAKE_OPTS_TARGET="-DUSE_AES=OFF \
+                       -DBUILD_TEST=ON"
+
+makeinstall_target() {
+  cp -v miniunz_exec $SYSROOT_PREFIX/usr/bin/miniunz
+  cp -v minizip_exec $SYSROOT_PREFIX/usr/bin/minizip
+}

From 39e434860570667d066a7404e1acad201c41cd68 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Fri, 13 Oct 2017 15:12:45 -0700
Subject: [PATCH 3/3] fixup! zlib: remove building minizip

---
 packages/compress/zlib/package.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index b12439dcf5..7620ed8f3d 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -28,4 +28,5 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="compress"
 PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
 PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
+PKG_AUTORECONF="no"
 PKG_USE_NINJA="no"