Merge pull request #243024 from adisbladis/vips-png-gif

vips: Improve GIF and PNG support

pkgs/tools/graphics/cgif/default.nix

@@ -0,0 +1,31 @@
+{ stdenv
+, fetchFromGitHub
+, lib
+, meson
+, ninja
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cgif";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "dloebl";
+    repo = "cgif";
+    rev = "V${finalAttrs.version}";
+    sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  meta = {
+    homepage = "https://github.com/dloebl/cgif";
+    description = "CGIF, a GIF encoder written in C.";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/tools/graphics/vips/default.nix

@@ -22,7 +22,7 @@
 , libtiff
 , fftw
 , lcms2
-, libpng
+, libspng
 , libimagequant
 , imagemagick
 , pango
@@ -35,6 +35,7 @@
 , libjxl
 , openslide
 , libheif
+, cgif
 }:
 
 stdenv.mkDerivation rec {
@@ -79,7 +80,7 @@ stdenv.mkDerivation rec {
     libtiff
     fftw
     lcms2
-    libpng
+    libspng
     libimagequant
     imagemagick
     pango
@@ -92,6 +93,7 @@ stdenv.mkDerivation rec {
     libjxl
     openslide
     libheif
+    cgif
   ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ];
 
   # Required by .pc file
@@ -100,8 +102,6 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dcgif=disabled"
-    "-Dspng=disabled"
     "-Dpdfium=disabled"
     "-Dnifti=disabled"
   ] ++ lib.optionals (!stdenv.isDarwin) [

pkgs/top-level/all-packages.nix

@@ -30297,6 +30297,8 @@ with pkgs;
 
   boops = callPackage ../applications/audio/boops { };
 
+  cgif = callPackage ../tools/graphics/cgif { };
+
   ChowCentaur  = callPackage ../applications/audio/ChowCentaur { };
 
   ChowKick  = callPackage ../applications/audio/ChowKick { };