Merge branch 'main' into aarch64

.github/workflows/build.sh

@@ -18,11 +18,6 @@ fi
 
 if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
   MB_PYTHON_OSX_VER="10.9"
-  if [[ "$PLAT" == "i686" ]]; then
-    DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
-  fi
-elif [[ "$MB_PYTHON_VERSION" == "3.11" ]] && [[ "$PLAT" == "i686" ]]; then
-  DOCKER_TEST_IMAGE="radarhere/bionic-$PLAT"
 fi
 
 if [[ "$PLAT" == "aarch64" ]]; then

.github/workflows/wheels-linux.yml

@@ -22,34 +22,30 @@ jobs:
       fail-fast: false
       matrix:
         python: [
-          "pypy3.8-7.3.11",
-          "pypy3.9-7.3.11",
+          "pypy3.9-7.3.12",
+          "pypy3.10-7.3.12",
           "3.8",
           "3.9",
           "3.10",
           "3.11",
           "3.12",
         ]
-        platform: [ "aarch64", "i686", "x86_64" ]
+        platform: [ "aarch64", "x86_64" ]
         mb-ml-libc: [ "manylinux", "musllinux" ]
         mb-ml-ver: [ 2014, "_1_1", "_2_28" ]
         exclude:
-          - python: "pypy3.8-7.3.11"
+          - python: "pypy3.9-7.3.12"
             mb-ml-libc: "musllinux"
-          - python: "pypy3.9-7.3.11"
+          - python: "pypy3.10-7.3.12"
             mb-ml-libc: "musllinux"
           - platform: "i686"
             mb-ml-ver: "_1_1"
-          - platform: "i686"
-            mb-ml-ver: "_2_28"
           - mb-ml-libc: "musllinux"
             mb-ml-ver: 2014
           - mb-ml-libc: "manylinux"
             mb-ml-ver: "_1_1"
           - mb-ml-libc: "musllinux"
             mb-ml-ver: "_2_28"
-          - platform: "i686"
-            python: "3.12"
     env:
       BUILD_COMMIT: ${{ inputs.build-commit }}
       PLAT: ${{ matrix.platform }}

.github/workflows/wheels-macos.yml

@@ -22,8 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         python: [
-          "pypy3.8-7.3.11",
-          "pypy3.9-7.3.11",
+          "pypy3.9-7.3.12",
+          "pypy3.10-7.3.12",
           "3.8",
           "3.9",
           "3.10",
@@ -32,9 +32,9 @@ jobs:
         ]
         platform: [ "x86_64", "arm64" ]
         exclude:
-          - python: "pypy3.8-7.3.11"
+          - python: "pypy3.9-7.3.12"
             platform: "arm64"
-          - python: "pypy3.9-7.3.11"
+          - python: "pypy3.10-7.3.12"
             platform: "arm64"
     env:
       BUILD_COMMIT: ${{ inputs.build-commit }}

config.sh

@@ -6,10 +6,10 @@ ARCHIVE_SDIR=pillow-depends-main
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.0
 HARFBUZZ_VERSION=7.3.0
-LIBPNG_VERSION=1.6.39
+LIBPNG_VERSION=1.6.40
 JPEGTURBO_VERSION=2.1.5.1
 OPENJPEG_VERSION=2.5.0
-XZ_VERSION=5.4.2
+XZ_VERSION=5.4.3
 TIFF_VERSION=4.5.0
 LCMS2_VERSION=2.15
 if [[ -n "$IS_MACOS" ]]; then
@@ -128,8 +128,7 @@ function pip_wheel_cmd {
         CFLAGS="$CFLAGS --std=c99"  # for Raqm
     fi
     pip wheel $(pip_opts) \
-        --global-option build_ext --global-option --enable-raqm \
-        --global-option --vendor-raqm --global-option --vendor-fribidi \
+        -C raqm=enable -C raqm=vendor -C fribidi=vendor \
         -w $abs_wheelhouse --no-deps .
 }
 
@@ -141,11 +140,7 @@ function run_tests_in_repo {
 
 EXP_CODECS="jpg jpg_2000 libtiff zlib"
 EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
-if ([ -n "$IS_MACOS" ] && [[ "$MB_PYTHON_VERSION" == 3.12 ]]); then
-    EXP_FEATURES="libjpeg_turbo transp_webp webp_anim webp_mux xcb"
-else
-    EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb"
-fi
+EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb"
 
 function run_tests {
     if [ -n "$IS_MACOS" ]; then
@@ -156,11 +151,7 @@ function run_tests {
         apt-get update
         apt-get install -y curl libfribidi0 unzip
     fi
-    if [[ $(uname -m) == "i686" ]]; then
-        if [[ "$MB_PYTHON_VERSION" != 3.11 ]]; then
-            python3 -m pip install numpy==1.21
-        fi
-    elif [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then
+    if [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then
         python3 -m pip install numpy
     fi
 

dependency_licenses/FREETYPE2.txt

@@ -1,35 +1,40 @@
-The  FreeType 2  font  engine is  copyrighted  work and  cannot be  used
-legally  without a  software license.   In  order to  make this  project
-usable  to a vast  majority of  developers, we  distribute it  under two
+The FreeType  2 font  engine is  copyrighted work  and cannot  be used
+legally without  a software  license.  In order  to make  this project
+usable to  a vast majority of  developers, we distribute it  under two
 mutually exclusive open-source licenses.
 
-This means  that *you* must choose  *one* of the  two licenses described
-below, then obey  all its terms and conditions when  using FreeType 2 in
+This means that *you* must choose  *one* of the two licenses described
+below, then obey all its terms and conditions when using FreeType 2 in
 any of your projects or products.
 
-  - The FreeType License, found in  the file `FTL.TXT', which is similar
-    to the original BSD license *with* an advertising clause that forces
-    you  to  explicitly cite  the  FreeType  project  in your  product's
-    documentation.  All  details are in the license  file.  This license
-    is  suited  to products  which  don't  use  the GNU  General  Public
-    License.
+  - The FreeType License,  found in the file  `docs/FTL.TXT`, which is
+    similar to the  original BSD license *with*  an advertising clause
+    that forces  you to explicitly  cite the FreeType project  in your
+    product's  documentation.  All  details are  in the  license file.
+    This license is suited to products which don't use the GNU General
+    Public License.
 
-    Note that  this license  is  compatible  to the  GNU General  Public
+    Note that  this license  is compatible to  the GNU  General Public
     License version 3, but not version 2.
 
-  - The GNU General Public License version 2, found in  `GPLv2.TXT' (any
-    later version can be used  also), for programs which already use the
-    GPL.  Note  that the  FTL is  incompatible  with  GPLv2 due  to  its
-    advertisement clause.
+  - The   GNU   General   Public   License   version   2,   found   in
+    `docs/GPLv2.TXT`  (any  later  version  can  be  used  also),  for
+    programs  which  already  use  the  GPL.  Note  that  the  FTL  is
+    incompatible with GPLv2 due to its advertisement clause.
 
-The contributed BDF and PCF drivers  come with a license similar to that
-of the X Window System.  It is compatible to the above two licenses (see
-file src/bdf/README and  src/pcf/README).  The same holds  for the files
-`fthash.c' and  `fthash.h'; their  code was  part of  the BDF  driver in
-earlier FreeType versions.
+The contributed  BDF and PCF  drivers come  with a license  similar to
+that  of the  X Window  System.   It is  compatible to  the above  two
+licenses (see files `src/bdf/README`  and `src/pcf/README`).  The same
+holds   for   the   source    code   files   `src/base/fthash.c`   and
+`include/freetype/internal/fthash.h`; they were part of the BDF driver
+in earlier FreeType versions.
 
-The gzip module uses the zlib license (see src/gzip/zlib.h) which too is
-compatible to the above two licenses.
+The gzip  module uses the  zlib license (see  `src/gzip/zlib.h`) which
+too is compatible to the above two licenses.
 
-The MD5 checksum support (only used for debugging in development builds)
-is in the public domain.
+The files `src/autofit/ft-hb.c` and `src/autofit/ft-hb.h` contain code
+taken almost  verbatim from the  HarfBuzz file `hb-ft.cc`,  which uses
+the 'Old MIT' license, compatible to the above two licenses.
+
+The  MD5 checksum  support  (only used  for  debugging in  development
+builds) is in the public domain.

dependency_licenses/HARFBUZZ.txt

@@ -2,19 +2,23 @@ HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
 
-Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020  Google, Inc.
-Copyright © 2018,2019,2020  Ebrahim Byagowi
-Copyright © 2019,2020  Facebook, Inc. 
-Copyright © 2012  Mozilla Foundation
+Copyright © 2010-2022  Google, Inc.
+Copyright © 2015-2020  Ebrahim Byagowi
+Copyright © 2019,2020  Facebook, Inc.
+Copyright © 2012,2015  Mozilla Foundation
 Copyright © 2011  Codethink Limited
 Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
 Copyright © 2009  Keith Stribley
-Copyright © 2009  Martin Hosken and SIL International
+Copyright © 2011  Martin Hosken and SIL International
 Copyright © 2007  Chris Wilson
-Copyright © 2006  Behdad Esfahbod
-Copyright © 2005  David Turner
-Copyright © 2004,2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2005,2006,2020,2021,2022,2023  Behdad Esfahbod
+Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023  Red Hat, Inc.
+Copyright © 1998-2005  David Turner and Werner Lemberg
+Copyright © 2016  Igalia S.L.
+Copyright © 2022  Matthias Clasen
+Copyright © 2018,2021  Khaled Hosny
+Copyright © 2018,2019,2020  Adobe, Inc
+Copyright © 2013-2015  Alexei Podtelezhnikov
 
 For full copyright notices consult the individual files in the package.
 

dependency_licenses/LIBPNG.txt

@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 1995-2022 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2022 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.