Update brotli

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 04cef6a77f82b8fcf0648c035391085a51daa5bd1e584d53ada3ed1f72e83409..8a744dd4e4131c1e36e4b4c7816d355596048d050aec618e70056cc6627cd0e3 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -22,8 +22,7 @@
 /BLAKE2.git/
 /boost_1_74_0.tar.bz2
 /boost_1_86_0.tar.bz2
-/brotli-dev-null-60-ga528bce.tar.zst
-/brotli.git/
+/brotli-1.2.0.tar.gz
 /c-ares-1.30.0.tar.gz
 /cairo-1.16.0.tar.xz
 /cmake-3.28.3.tar.gz

diff --git a/build/distfiles/brotli-1.2.0.tar.gz.meta4 b/build/distfiles/brotli-1.2.0.tar.gz.meta4
new file mode 100644 (file)
index 0000000..25c35fc
--- /dev/null
+++ b/build/distfiles/brotli-1.2.0.tar.gz.meta4
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="brotli-1.2.0.tar.gz">
+    <hash type="blake3-256">88a91819bc0e0b5bd27bd8c7d8ffddf132768851069f2cd5e905eac87e2860de</hash>
+    <hash type="blake2b-512">e38ea35f4abe47b2113ccc0778bb7b0be77dcf4d26ce248347ecc4cfdea7ba40d17e0b175cad6f82055d07b1ec9976ffea649f59065866db2c36116c77e59824</hash>
+    <hash type="blake2b-256">367870fd12cffe535450010b5aae24d06c869a9c228279710ef845b95720f266</hash>
+    <hash type="skein-512">1406691998355acbdd29b971b8df5335b34af1db8e85b6fdb40b2d5a347ba8685ff17c3932d3598ff9e62454a72236167ea638e41ac26e46f3c931df317b59cf</hash>
+    <hash type="shake128">cddba4ecc5aa54a7ee92266b11c7c72d3c11d991ea800c4d0b42ba1ba48f1f03</hash>
+    <hash type="shake256">1e086cba8fa617ec72c1356a4ba0dd8bdde5aaee25f3911b9800ee7aff423a7b0236e1e62024d9c77be20b93ea4eb50abdd4ccc29ba67a5f01719fea466c2bb3</hash>
+    <hash type="sha-512">f94542afd2ecd96cc41fd21a805a3da314281ae558c10650f3e6d9ca732b8425bba8fde312823f0a564c7de3993bdaab5b43378edab65ebb798cefb6fd702256</hash>
+    <hash type="sha-256">816c96e8e8f193b40151dad7e8ff37b1221d019dbcb9c35cd3fadbfe6477dfec</hash>
+    <hash type="streebog-512">b8d7f72332625b7bfb717f1340b731f02e4479f4c80e748cd57b5a737887a75c8124c7c42c8af331a7573016d5584c416353743bbc354063f41e388a7f9872f7</hash>
+    <hash type="streebog-256">69a4fc30f281cde538461c42544d098715a3bc2ce23f5ecbaec55270e215dbe1</hash>
+    <hash type="xxh3-128">4efbea46d6ca79a2dadea8416f225910</hash>
+    <size>646315</size>
+    <url location="xg">https://codeload.github.com/google/brotli/tar.gz/v1.2.0</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/brotli-dev-null-60-ga528bce.tar.zst.do b/build/distfiles/brotli-dev-null-60-ga528bce.tar.zst.do
deleted file mode 100644 (file)
index 232ca20..0000000
--- a/build/distfiles/brotli-dev-null-60-ga528bce.tar.zst.do
+++ /dev/null
@@ -1,7 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-[ -d brotli.git ] || git clone --depth 1 --bare https://github.com/google/brotli.git >&2
-cd brotli.git
-commit=a528bce9f65be7515a47cec2cbdcd8023822b99b
-git fetch origin $commit >&2
-git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR

diff --git a/build/skel/archivers/brotli-dev-null-60-ga528bce.do b/build/skel/archivers/brotli-1.2.0.do
similarity index 88%
rename from build/skel/archivers/brotli-dev-null-60-ga528bce.do
rename to build/skel/archivers/brotli-1.2.0.do
index bd144b8c00d0caf09023508ead741908ce3068eaa424b97d460dcc3209ccec63..32b38ad7f808657af74015f4d618fbc1edefbe8a2067f78b26eaf0bebfa6332f 100644 (file)
--- a/build/skel/archivers/brotli-dev-null-60-ga528bce.do
+++ b/build/skel/archivers/brotli-1.2.0.do
@@ -3,12 +3,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3"
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps
 . ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.zst
+$TAR xf "$DISTFILES"/$NAME.tar.gz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME

diff --git a/build/skel/graphics/libjxl-v0.11.2.do b/build/skel/graphics/libjxl-v0.11.2.do
index 8f13c1655afffe855f27eacd5ec009f718caec06bd7cb4d47b879137a274eaf6..984940ca1d4557fab83c8dee28b1e13f96a0ccb7dbdf12ea76dca4c2450e7468 100644 (file)
--- a/build/skel/graphics/libjxl-v0.11.2.do
+++ b/build/skel/graphics/libjxl-v0.11.2.do
@@ -10,7 +10,11 @@ devel/cmake-3.28.3
 devel/ninja-v1.12.1
 devel/pkgconf-2.1.1
 "
-rdeps="graphics/libavif-v1.3.0-137-g3126181b graphics/libwebp-1.4.0"
+rdeps="
+archivers/brotli-1.2.0
+graphics/libavif-v1.3.0-137-g3126181b
+graphics/libwebp-1.4.0
+"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
@@ -22,7 +26,10 @@ $TAR xf "$DISTFILES"/$NAME.tar.zst --options read_concatenated_archives
 cd $NAME
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
+cmake -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
     -DCMAKE_INSTALL_PREFIX="$SKELBINS"/$ARCH/$NAME-$hsh  .. >&2
 cmake --build . --parallel >&2
 ninja install >&2

diff --git a/build/skel/graphics/mupdf-1.27.2.do b/build/skel/graphics/mupdf-1.27.2.do
index cd4bf745ab1c380636ca9eb3ca8720277d7ef0df6f3dea69acee2a7cbfa3c7ca..a66457911e24937b3e276281d5f2251bb19cd267d0718ec174ea92efc339015a 100644 (file)
--- a/build/skel/graphics/mupdf-1.27.2.do
+++ b/build/skel/graphics/mupdf-1.27.2.do
@@ -11,6 +11,7 @@ devel/pkgconf-2.1.1
 shells/bash-5.2.21
 "
 rdeps="
+archivers/brotli-1.2.0
 graphics/freetype-2.13.3
 graphics/libjpeg-turbo-3.0.3
 "
@@ -29,6 +30,7 @@ XCFLAGS=-fPIC gmake -j$MAKE_JOBS \
     HAVE_CURL=no \
     USE_SYSTEM_FREETYPE=yes \
     USE_SYSTEM_HARFBUZZ=yes \
+    USE_SYSTEM_BROTLI=yes \
     build=release \
     mujs=no \
     prefix="$SKELBINS"/$ARCH/$NAME-$hsh \