diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 684b4b0e9..83041dafb 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -104,10 +104,10 @@ TIFF_VERSION=4.7.0 LCMS2_VERSION=2.17 ZLIB_VERSION=1.3.1 ZLIB_NG_VERSION=2.2.4 -LIBWEBP_VERSION=1.5.0 # Patched +LIBWEBP_VERSION=1.5.0 # Patched; next release won't need patching. See patch file. BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 -BROTLI_VERSION=1.1.0 # Patched +BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file. function build_pkg_config { if [ -e pkg-config-stamp ]; then return; fi diff --git a/patches/iOS/brotli-1.1.0.tar.gz.patch b/patches/iOS/brotli-1.1.0.tar.gz.patch index 9e79266bb..f165a9ac1 100644 --- a/patches/iOS/brotli-1.1.0.tar.gz.patch +++ b/patches/iOS/brotli-1.1.0.tar.gz.patch @@ -1,4 +1,7 @@ -# Brotli doesn't have explicit support for iOS as a CMAKE_SYSTEM_NAME. +# Brotli 1.1.0 doesn't have explicit support for iOS as a CMAKE_SYSTEM_NAME. +# That release was from 2023; there have been subsequent changes that allow +# Brotli to build on iOS without any patches, as long as -DBROTLI_BUILD_TOOLS=NO +# is specified on the command line. # diff -ru brotli-1.1.0-orig/CMakeLists.txt brotli-1.1.0/CMakeLists.txt --- brotli-1.1.0-orig/CMakeLists.txt 2023-08-29 19:00:29 diff --git a/patches/iOS/libwebp-1.5.0.tar.gz.patch b/patches/iOS/libwebp-1.5.0.tar.gz.patch index 8fce7ce64..2ea587554 100644 --- a/patches/iOS/libwebp-1.5.0.tar.gz.patch +++ b/patches/iOS/libwebp-1.5.0.tar.gz.patch @@ -6,6 +6,9 @@ # 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