Bump brotli to v1.2.1 (#5062)

Also fix CI on x86.
This commit is contained in:
Luca Versari authored and GitHub committed 2026-10-24 16:59:44 +00:00
1 parent 777e88f46a
commit e47d2a2b5b
3 files changed
+13 -14

No files matched your search

+11 -12
View File
@@ -15,13 +15,13 @@ MYDIR=$(dirname "${SELF}")
# Git revisions we use for the given submodules. Update these whenever you
# update a git submodule.
TESTDATA="873045a9c42ed60721756e26e2a6b32e17415205"
THIRD_PARTY_BROTLI="028fb5a23661f123017c060daa546b55cf4bde29" # v1.2.0
THIRD_PARTY_GOOGLETEST="6910c9d9165801d8827d628cb72eb7ea9dd538c5" # v1.16.0
THIRD_PARTY_HIGHWAY="457c891775a7397bdb0376bb1031e6e027af1c48" # v1.2.0
THIRD_PARTY_SKCMS="96d9171c94b937a1b5f0293de7309ac16311b722" # 2025_09_16
THIRD_PARTY_SJPEG="94e0df6d0f8b44228de5be0ff35efb9f946a13c9" # Wed Apr 2 15:42:02 2025 -0700
THIRD_PARTY_ZLIB="51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf" # v1.3.1
THIRD_PARTY_LIBPNG="872555f4ba910252783af1507f9e7fe1653be252" # v1.6.47
THIRD_PARTY_BROTLI="db24a98aed38a16de78cc05ca15cdd8dc2a0d92d" # v1.2.1
THIRD_PARTY_GOOGLETEST="6910c9d9165801d8827d628cb72eb7ea9dd538c5" # v1.16.0
THIRD_PARTY_HIGHWAY="457c891775a7397bdb0376bb1031e6e027af1c48" # v1.2.0
THIRD_PARTY_SKCMS="96d9171c94b937a1b5f0293de7309ac16311b722" # 2025_09_16
THIRD_PARTY_SJPEG="94e0df6d0f8b44228de5be0ff35efb9f946a13c9" # Wed Apr 2 15:42:02 2025 -0700
THIRD_PARTY_ZLIB="51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf" # v1.3.1
THIRD_PARTY_LIBPNG="872555f4ba910252783af1507f9e7fe1653be252" # v1.6.47
THIRD_PARTY_LIBJPEG_TURBO="8ecba3647edb6dd940463fedf38ca33a8e2a73d1" # 2.1.5.1
# Download the target revision from GitHub.
@@ -29,7 +29,7 @@ download_github() {
local path="$1"
local project="$2"
local varname=`echo "$path" | tr '[:lower:]' '[:upper:]'`
local varname=$(echo "$path" | tr '[:lower:]' '[:upper:]')
varname="${varname//[\/-]/_}"
local sha
eval "sha=\${${varname}}"
@@ -55,13 +55,12 @@ download_github() {
}
is_git_repository() {
local dir="$1"
local toplevel=$(git rev-parse --show-toplevel)
local dir="$1"
local toplevel=$(git rev-parse --show-toplevel)
[[ "${dir}" == "${toplevel}" ]]
[[ "${dir}" == "${toplevel}" ]]
}
main() {
if is_git_repository "${MYDIR}"; then
cat >&2 <<EOF
+1 -1
View File
@@ -35,7 +35,7 @@ BUNDLE_BUILD=(ccache ninja-build)
BUNDLE_CONFORMANCE=(python3-numpy qemu-user qemu-user-binfmt)
BUNDLE_DOCS=(doxygen graphviz)
BUNDLE_EXTRAS=(libgif-dev libjpeg-dev libpng-dev libwebp-dev libilmbase-dev libopenexr-dev)
BUNDLE_EXTRAS_RUNTIME=(libgif7 libjpeg-turbo8 libpng16-16t64 libwebp7 libopenexr-3-1-30)
BUNDLE_EXTRAS_RUNTIME=(libgif7 libjpeg-turbo8 libpng16-16t64 libwebp7 libimath-3-1-29t64 libopenexr-3-1-30)
BUNDLE_PLUGINS=(libgdk-pixbuf-xlib-2.0-dev libgtk2.0-dev)
BUNDLE_RUNTIME=(libbrotli1)