diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
| commit | 69bfdf2484041b9d242840c4e5017b4703383bb0 (patch) | |
| tree | d8bdaa69e7990d7d6f09b594b3c425f742acd2d0 /nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch | |
| parent | c8aee4b4363b6bf905a521b05b7476960e8286c8 (diff) | |
| parent | d8fe5e6c92d0d190646fb9f1056741a229980089 (diff) | |
| download | nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.gz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.bz2 nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.lz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.xz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.zst nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.zip | |
Merge commit 'd8fe5e6c'
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch b/nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch new file mode 100644 index 000000000000..2a0bc50fb12d --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch @@ -0,0 +1,40 @@ +Index: b/apngopt.cpp +=================================================================== +--- a/apngopt.cpp ++++ b/apngopt.cpp +@@ -33,7 +33,6 @@ + #include <vector> + #include "png.h" /* original (unpatched) libpng is ok */ + #include "zlib.h" +-#include "7z.h" + extern "C" { + #include "zopfli.h" + } +@@ -958,8 +957,6 @@ void deflate_rect_fin(int deflate_method + if (deflate_method == 1) + { + unsigned size = zbuf_size; +- compress_rfc1950_7z(rows, op[n].h*(rowbytes + 1), zbuf, size, iter<100 ? iter : 100, 255); +- *zsize = size; + } + else + { +@@ -1438,8 +1435,7 @@ int main(int argc, char** argv) + if (argc <= 1) + { + printf("\n\nUsage: apngopt [options] anim.png [anim_opt.png]\n\n" +- "-z0 : zlib compression\n" +- "-z1 : 7zip compression (default)\n" ++ "-z0 : zlib compression (default)\n" + "-z2 : zopfli compression\n" + "-i## : number of iterations, default -i%d\n", iter); + return 1; +@@ -1459,7 +1455,7 @@ int main(int argc, char** argv) + if (szOpt[2] == '0') + deflate_method = 0; + if (szOpt[2] == '1') +- deflate_method = 1; ++ deflate_method = 0; + if (szOpt[2] == '2') + deflate_method = 2; + } |