mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-07-12 09:12:22 +03:00
Update libwebp to 1.6.0 (#9082)
This commit is contained in:
commit
3c4fe62c1e
8
.github/workflows/wheels-dependencies.sh
vendored
8
.github/workflows/wheels-dependencies.sh
vendored
|
@ -103,7 +103,7 @@ TIFF_VERSION=4.7.0
|
||||||
LCMS2_VERSION=2.17
|
LCMS2_VERSION=2.17
|
||||||
ZLIB_VERSION=1.3.1
|
ZLIB_VERSION=1.3.1
|
||||||
ZLIB_NG_VERSION=2.2.4
|
ZLIB_NG_VERSION=2.2.4
|
||||||
LIBWEBP_VERSION=1.5.0 # Patched; next release won't need patching. See patch file.
|
LIBWEBP_VERSION=1.6.0
|
||||||
BZIP2_VERSION=1.0.8
|
BZIP2_VERSION=1.0.8
|
||||||
LIBXCB_VERSION=1.17.0
|
LIBXCB_VERSION=1.17.0
|
||||||
BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file.
|
BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file.
|
||||||
|
@ -280,7 +280,11 @@ function build {
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
webp_cflags="$webp_cflags -Wl,-headerpad_max_install_names"
|
webp_cflags="$webp_cflags -Wl,-headerpad_max_install_names"
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS $webp_cflags" build_simple libwebp $LIBWEBP_VERSION \
|
webp_ldflags=""
|
||||||
|
if [[ -n "$IOS_SDK" ]]; then
|
||||||
|
webp_ldflags="$webp_ldflags -llzma -lz"
|
||||||
|
fi
|
||||||
|
CFLAGS="$CFLAGS $webp_cflags" LDFLAGS="$LDFLAGS $webp_ldflags" build_simple libwebp $LIBWEBP_VERSION \
|
||||||
https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
|
https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
|
||||||
--enable-libwebpmux --enable-libwebpdemux
|
--enable-libwebpmux --enable-libwebpdemux
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# install webp
|
# install webp
|
||||||
|
|
||||||
archive=libwebp-1.5.0
|
archive=libwebp-1.6.0
|
||||||
|
|
||||||
./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
|
./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
|
||||||
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# libwebp example binaries require dependencies that aren't available for iOS builds.
|
|
||||||
# There's also no easy way to invoke the build to *exclude* the example builds.
|
|
||||||
# Since we don't need the examples anyway, remove them from the Makefile.
|
|
||||||
#
|
|
||||||
# As a point of reference, libwebp provides an XCFramework build script that involves
|
|
||||||
# 7 separate invocations of make to avoid building the examples. Patching the Makefile
|
|
||||||
# to remove the examples is a simpler approach, and one that is more compatible with
|
|
||||||
# the existing multibuild infrastructure.
|
|
||||||
#
|
|
||||||
# In the next release, it should be possible to pass --disable-libwebpexamples
|
|
||||||
# instead of applying this patch.
|
|
||||||
#
|
|
||||||
diff -ur libwebp-1.5.0-orig/Makefile.am libwebp-1.5.0/Makefile.am
|
|
||||||
--- libwebp-1.5.0-orig/Makefile.am 2024-12-20 09:17:50
|
|
||||||
+++ libwebp-1.5.0/Makefile.am 2025-01-09 11:24:17
|
|
||||||
@@ -5,5 +5,3 @@
|
|
||||||
if BUILD_EXTRAS
|
|
||||||
SUBDIRS += extras
|
|
||||||
endif
|
|
||||||
-
|
|
||||||
-SUBDIRS += examples
|
|
||||||
diff -ur libwebp-1.5.0-orig/Makefile.in libwebp-1.5.0/Makefile.in
|
|
||||||
--- libwebp-1.5.0-orig/Makefile.in 2024-12-20 09:52:53
|
|
||||||
+++ libwebp-1.5.0/Makefile.in 2025-01-09 11:24:17
|
|
||||||
@@ -156,7 +156,7 @@
|
|
||||||
unique=`for i in $$list; do \
|
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
||||||
done | $(am__uniquify_input)`
|
|
||||||
-DIST_SUBDIRS = sharpyuv src imageio man extras examples
|
|
||||||
+DIST_SUBDIRS = sharpyuv src imageio man extras
|
|
||||||
am__DIST_COMMON = $(srcdir)/Makefile.in \
|
|
||||||
$(top_srcdir)/src/webp/config.h.in AUTHORS COPYING ChangeLog \
|
|
||||||
NEWS README.md ar-lib compile config.guess config.sub \
|
|
||||||
@@ -351,7 +351,7 @@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
webp_libname_prefix = @webp_libname_prefix@
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
-SUBDIRS = sharpyuv src imageio man $(am__append_1) examples
|
|
||||||
+SUBDIRS = sharpyuv src imageio man $(am__append_1)
|
|
||||||
EXTRA_DIST = COPYING autogen.sh
|
|
||||||
all: all-recursive
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ V = {
|
||||||
"LIBAVIF": "1.3.0",
|
"LIBAVIF": "1.3.0",
|
||||||
"LIBIMAGEQUANT": "4.3.4",
|
"LIBIMAGEQUANT": "4.3.4",
|
||||||
"LIBPNG": "1.6.49",
|
"LIBPNG": "1.6.49",
|
||||||
"LIBWEBP": "1.5.0",
|
"LIBWEBP": "1.6.0",
|
||||||
"OPENJPEG": "2.5.3",
|
"OPENJPEG": "2.5.3",
|
||||||
"TIFF": "4.7.0",
|
"TIFF": "4.7.0",
|
||||||
"XZ": "5.8.1",
|
"XZ": "5.8.1",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user