Merge branch 'main' into libavif-plugin

This commit is contained in:
Andrew Murray 2025-01-04 18:05:48 +11:00 committed by GitHub
commit 413566481b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -168,7 +168,7 @@ EOF
function build { function build {
build_xz build_xz
if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
yum remove -y zlib-devel yum remove -y zlib-devel
fi fi
build_zlib_ng build_zlib_ng
@ -209,6 +209,8 @@ function build {
# For giflib 5.2.2 # For giflib 5.2.2
elif [ -n "$IS_ALPINE" ]; then elif [ -n "$IS_ALPINE" ]; then
apk add imagemagick apk add imagemagick
elif [ -n "$SANITIZER" ]; then
apt-get install -y imagemagick
else else
if [[ "$MB_ML_VER" == "_2_28" ]]; then if [[ "$MB_ML_VER" == "_2_28" ]]; then
yum install -y epel-release yum install -y epel-release