pigz: Disable ZOPFLI support

2 files changed, 1 insertions, 45 deletions

diff --git a/pkg/pigz/gen.lua b/pkg/pigz/gen.lua
index f0bb4a9b..f2d4cdd6 100644
--- a/pkg/pigz/gen.lua
+++ b/pkg/pigz/gen.lua
@@ -1,11 +1,11 @@
 cflags{
 	'-Wall', '-Wextra', '-Wno-clobbered', '-Wno-stringop-overflow',
+	'-D NOZOPFLI',
 	'-isystem $builddir/pkg/zlib/include',
 }
 
 exe('pigz', [[
 	pigz.c yarn.c try.c
-	zopfli/src/zopfli/(deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c squeeze.c katajainen.c)
 	$builddir/pkg/zlib/libz.a
 ]], {'pkg/zlib/headers'})
 file('bin/pigz', '755', '$outdir/pigz')
diff --git a/pkg/pigz/patch/0002-Restructure-loop-to-prevent-warning.patch b/pkg/pigz/patch/0002-Restructure-loop-to-prevent-warning.patch
deleted file mode 100644
index 7b3d35fd..00000000
--- a/pkg/pigz/patch/0002-Restructure-loop-to-prevent-warning.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 758851fab26523b69e92f2973c636647614406c2 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 27 Dec 2017 21:07:16 -0800
-Subject: [PATCH] Restructure loop to prevent warning
-
----
- zopfli/src/zopfli/deflate.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/zopfli/src/zopfli/deflate.c b/zopfli/src/zopfli/deflate.c
-index 4b0724b..f3d7745 100644
---- a/zopfli/src/zopfli/deflate.c
-+++ b/zopfli/src/zopfli/deflate.c
-@@ -378,22 +378,22 @@ Change the population counts in a way that the consequent Hufmann tree
- compression, especially its rle-part will be more likely to compress this data
- more efficiently. length containts the size of the histogram.
- */
--void OptimizeHuffmanForRle(int length, size_t* counts) {
-+static void OptimizeHuffmanForRle(int length, size_t* counts) {
-   int i, k, stride;
-   size_t symbol, sum, limit;
-   int* good_for_rle;
- 
-   /* 1) We don't want to touch the trailing zeros. We may break the
-   rules of the format by adding more data in the distance codes. */
--  for (; length >= 0; --length) {
--    if (length == 0) {
--      return;
--    }
-+  for (; length > 0; --length) {
-     if (counts[length - 1] != 0) {
-       /* Now counts[0..length - 1] does not have trailing zeros. */
-       break;
-     }
-   }
-+  if (length == 0) {
-+    return;
-+  }
-   /* 2) Let's mark all population counts that already can be encoded
-   with an rle code.*/
-   good_for_rle = (int*)malloc(length * sizeof(int));
--- 
-2.15.1
-