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

src/SPC/builder/unix/library/imagemagick.php

@@ -32,10 +32,10 @@ trait imagemagick
             ->optionalLib('zstd', ...ac_with_args('zstd'))
             ->optionalLib('freetype', ...ac_with_args('freetype'))
             ->optionalLib('bzip2', ...ac_with_args('bzlib'))
+            ->optionalLib('libjxl', ...ac_with_args('jxl'))
+            ->optionalLib('jbig', ...ac_with_args('jbig'))
             ->addConfigureArgs(
                 '--disable-openmp',
-                '--without-jbig',
-                '--without-jxl',
                 '--without-x',
             );