Merge remote-tracking branch 'origin/main' into zig

config/lib.json

@@ -228,8 +228,9 @@
         ],
         "lib-depends": [
             "zlib",
-            "libpng",
             "libjpeg",
+            "libjxl",
+            "libpng",
             "libwebp",
             "freetype",
             "libtiff",
@@ -252,6 +253,18 @@
             "openssl"
         ]
     },
+    "jbig": {
+        "source": "jbig",
+        "static-libs-unix": [
+            "libjbig.a",
+            "libjbig85.a"
+        ],
+        "headers": [
+            "jbig.h",
+            "jbig85.h",
+            "jbig_ar.h"
+        ]
+    },
     "ldap": {
         "source": "ldap",
         "static-libs-unix": [
@@ -265,6 +278,13 @@
             "libsodium"
         ]
     },
+    "lerc": {
+        "source": "lerc",
+        "static-libs-unix": [
+            "libLerc.a"
+        ],
+        "cpp-library": true
+    },
     "libacl": {
         "source": "libacl",
         "static-libs-unix": [
@@ -400,6 +420,21 @@
             "zlib"
         ]
     },
+    "libjxl": {
+        "source": "libjxl",
+        "static-libs-unix": [
+            "libjxl.a",
+            "libjxl_cms.a",
+            "libjxl_threads.a",
+            "libhwy.a"
+        ],
+        "lib-depends": [
+            "brotli",
+            "libjpeg",
+            "libpng",
+            "libwebp"
+        ]
+    },
     "liblz4": {
         "source": "liblz4",
         "static-libs-unix": [
@@ -485,9 +520,6 @@
         ],
         "lib-depends": [
             "openssl"
-        ],
-        "lib-suggests": [
-            "zlib"
         ]
     },
     "libtiff": {
@@ -498,6 +530,13 @@
         "lib-depends": [
             "zlib",
             "libjpeg"
+        ],
+        "lib-suggests-unix": [
+            "lerc",
+            "libwebp",
+            "jbig",
+            "xz",
+            "zstd"
         ]
     },
     "libuuid": {
@@ -813,6 +852,15 @@
             "libiconv"
         ]
     },
+    "watcher": {
+        "source": "watcher",
+        "static-libs-unix": [
+            "libwatcher-c.a"
+        ],
+        "headers": [
+            "wtr/watcher-c.h"
+        ]
+    },
     "xz": {
         "source": "xz",
         "static-libs-unix": [
@@ -866,14 +914,5 @@
             "zstd.h",
             "zstd_errors.h"
         ]
-    },
-    "watcher": {
-        "source": "watcher",
-        "static-libs-unix": [
-            "libwatcher-c.a"
-        ],
-        "headers": [
-            "wtr/watcher-c.h"
-        ]
     }
 }

config/source.json

@@ -388,6 +388,19 @@
             "path": "LICENSE"
         }
     },
+    "jbig": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/jbig/jbigkit-2.1.tar.gz",
+        "provide-pre-built": true,
+        "alt": {
+            "type": "url",
+            "url": "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-2.1.tar.gz"
+        },
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -397,6 +410,16 @@
             "path": "LICENSE"
         }
     },
+    "lerc": {
+        "type": "ghtar",
+        "repo": "Esri/lerc",
+        "prefer-stable": true,
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libacl": {
         "alt": {
             "type": "url",
@@ -534,6 +557,21 @@
             "path": "LICENSE.md"
         }
     },
+    "libjxl": {
+        "type": "git",
+        "url": "https://github.com/libjxl/libjxl",
+        "rev": "main",
+        "submodules": [
+            "third_party/highway",
+            "third_party/libjpeg-turbo",
+            "third_party/sjpeg",
+            "third_party/skcms"
+        ],
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "liblz4": {
         "type": "ghrel",
         "repo": "lz4/lz4",
@@ -597,6 +635,7 @@
         "repo": "libssh2/libssh2",
         "match": "libssh2.+\\.tar\\.gz",
         "prefer-stable": true,
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -606,7 +645,6 @@
         "type": "filelist",
         "url": "https://download.osgeo.org/libtiff/",
         "regex": "/href=\"(?<file>tiff-(?<version>[^\"]+)\\.tar\\.xz)\"/",
-        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -994,6 +1032,15 @@
             "path": "COPYING"
         }
     },
+    "watcher": {
+        "type": "ghtar",
+        "repo": "e-dant/watcher",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "license"
+        }
+    },
     "xdebug": {
         "type": "url",
         "url": "https://pecl.php.net/get/xdebug",
@@ -1074,14 +1121,5 @@
             "type": "file",
             "path": "LICENSE"
         }
-    },
-    "watcher": {
-        "type": "ghtar",
-        "repo": "e-dant/watcher",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "license"
-        }
     }
 }