From b606e811669a3f45d54740bb593d12058c3cbd4f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 30 Mar 2023 18:21:22 +0200 Subject: [PATCH 1/3] apng2gif: init at 1.8 --- pkgs/tools/graphics/apng2gif/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/graphics/apng2gif/default.nix diff --git a/pkgs/tools/graphics/apng2gif/default.nix b/pkgs/tools/graphics/apng2gif/default.nix new file mode 100644 index 000000000000..d4fdd7d448c4 --- /dev/null +++ b/pkgs/tools/graphics/apng2gif/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchzip +, libpng +}: + +stdenv.mkDerivation rec { + pname = "apng2gif"; + version = "1.8"; + + src = fetchzip { + url = "mirror://sourceforge/apng2gif/apng2gif-${version}-src.zip"; + stripRoot = false; + hash = "sha256-qX8gmE0Lu2p15kL0y6cmX/bI0uk5Ehfi8ygt07BbgmU="; + }; + + # Remove bundled libs + postPatch = '' + rm -r libpng zlib + ''; + + buildInputs = [ + libpng + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + + installPhase = '' + runHook preInstall + install -Dm755 apng2gif $out/bin/apng2gif + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://apng2gif.sourceforge.net/"; + description = "A simple program that converts APNG files to animated GIF format"; + license = licenses.zlib; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496faefd0c91..e5b4b82302b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17326,6 +17326,8 @@ with pkgs; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; + apng2gif = callPackage ../tools/graphics/apng2gif { }; + kt = callPackage ../tools/misc/kt { }; argbash = callPackage ../development/tools/misc/argbash { }; From 0c77de452ccc9ba5b4f170738fa23d8fe04cfa02 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 30 Mar 2023 18:22:14 +0200 Subject: [PATCH 2/3] gif2apng: init at 1.9 --- pkgs/tools/graphics/gif2apng/default.nix | 69 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/tools/graphics/gif2apng/default.nix diff --git a/pkgs/tools/graphics/gif2apng/default.nix b/pkgs/tools/graphics/gif2apng/default.nix new file mode 100644 index 000000000000..712dc395246f --- /dev/null +++ b/pkgs/tools/graphics/gif2apng/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchzip +, fetchpatch +, zlib +, zopfli +}: + +stdenv.mkDerivation rec { + pname = "gif2apng"; + version = "1.9"; + + src = fetchzip { + url = "mirror://sourceforge/gif2apng/gif2apng-${version}-src.zip"; + stripRoot = false; + hash = "sha256-rt1Vp4hjeFAVWJOU04BdU2YvBwECe9Q1c7EpNpIN+uE="; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/g/gif2apng/1.9%2Bsrconly-3%2Bdeb11u1/debian/patches/10-7z.patch"; + hash = "sha256-zQgSWP/CIGaTUIxP/X92zpAQVSGgVo8gQEoCCMn+XT0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/gif2apng/1.9%2Bsrconly-3%2Bdeb11u1/debian/patches/CVE-2021-45909.patch"; + hash = "sha256-ZDN3xgvktgahDEtrEpyVsL+4u+97Fo9vAB1RSKhu8KA="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/gif2apng/1.9%2Bsrconly-3%2Bdeb11u1/debian/patches/CVE-2021-45910.patch"; + hash = "sha256-MzOUOC7kqH22DmTMXoDu+jZAMBJPndnFNJGAQv5FcdI="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/gif2apng/1.9%2Bsrconly-3%2Bdeb11u1/debian/patches/CVE-2021-45911.patch"; + hash = "sha256-o2YDHsSaorCx/6bQQfudzkLHo9pakgyvs2Pbafplnek="; + }) + ]; + + # Remove bundled libs + postPatch = '' + rm -r 7z zlib zopfli + ''; + + buildInputs = [ + zlib + zopfli + ]; + + preBuild = '' + buildFlagsArray+=("LIBS=-lzopfli -lstdc++ -lz") + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + + NIX_CFLAGS_COMPILE="-DENABLE_LOCAL_ZOPFLI"; + + installPhase = '' + runHook preInstall + install -Dm755 gif2apng $out/bin/gif2apng + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://gif2apng.sourceforge.net/"; + description = "A simple program that converts animations from GIF to APNG format"; + license = licenses.zlib; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5b4b82302b8..7149970d08fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17328,6 +17328,8 @@ with pkgs; apng2gif = callPackage ../tools/graphics/apng2gif { }; + gif2apng = callPackage ../tools/graphics/gif2apng { }; + kt = callPackage ../tools/misc/kt { }; argbash = callPackage ../development/tools/misc/argbash { }; From 9f10ac64ef840c41ab43dee6b3ffe07e788428ca Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 30 Mar 2023 18:22:49 +0200 Subject: [PATCH 3/3] apngopt: init at 1.4 --- pkgs/tools/graphics/apngopt/default.nix | 53 +++++++++++++++++++++ pkgs/tools/graphics/apngopt/remove-7z.patch | 40 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/tools/graphics/apngopt/default.nix create mode 100644 pkgs/tools/graphics/apngopt/remove-7z.patch diff --git a/pkgs/tools/graphics/apngopt/default.nix b/pkgs/tools/graphics/apngopt/default.nix new file mode 100644 index 000000000000..e0c097732452 --- /dev/null +++ b/pkgs/tools/graphics/apngopt/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchzip +, libpng +, zlib +, zopfli +}: + +stdenv.mkDerivation rec { + pname = "apngopt"; + version = "1.4"; + + src = fetchzip { + url = "mirror://sourceforge/apng/apngopt-${version}-src.zip"; + stripRoot = false; + hash = "sha256-MAqth5Yt7+SabY6iEgSFcaBmuHvA0ZkNdXSgvhKao1Y="; + }; + + patches = [ + ./remove-7z.patch + ]; + + # Remove bundled libs + postPatch = '' + rm -r 7z libpng zlib zopfli + ''; + + buildInputs = [ + libpng + zlib + zopfli + ]; + + preBuild = '' + buildFlagsArray+=("LIBS=-lzopfli -lstdc++ -lpng -lz") + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + + installPhase = '' + runHook preInstall + install -Dm755 apngopt $out/bin/apngopt + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/apng/"; + description = "Optimizes APNG animations"; + license = licenses.zlib; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/apngopt/remove-7z.patch b/pkgs/tools/graphics/apngopt/remove-7z.patch new file mode 100644 index 000000000000..2a0bc50fb12d --- /dev/null +++ b/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 + #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; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7149970d08fd..d5bd01dd0e42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17330,6 +17330,8 @@ with pkgs; gif2apng = callPackage ../tools/graphics/gif2apng { }; + apngopt = callPackage ../tools/graphics/apngopt { }; + kt = callPackage ../tools/misc/kt { }; argbash = callPackage ../development/tools/misc/argbash { };