@@ -3,6 +3,8 @@ From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 5 May 2025 16:08:37 +0000
Subject: [PATCH] setup.py: support cross compiling
+Refreshed for pillow-heif 1.5.0 (context shifted).
+
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
@@ -11,10 +13,10 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
-index 68945e4..67566e8 100644
+index f6d444d..29b6b4d 100644
--- a/setup.py
+++ b/setup.py
-@@ -125,12 +125,12 @@ class PillowHeifBuildExt(build_ext):
+@@ -126,12 +126,12 @@ class PillowHeifBuildExt(build_ext):
self._add_directory(library_dirs, match.group(1))
# include, rpath, if set as environment variables
@@ -29,8 +31,8 @@ index 68945e4..67566e8 100644
if k in os.environ:
for d in os.environ[k].split(os.path.pathsep):
self._add_directory(library_dirs, d)
-@@ -199,12 +199,15 @@ class PillowHeifBuildExt(build_ext):
- self._update_extension("_pillow_heif", ["heif"], extra_compile_args=["-O3", "-Werror"])
+@@ -210,12 +210,15 @@ class PillowHeifBuildExt(build_ext):
+ )
else: # let's assume it's some kind of linux
# this old code waiting for refactoring, when time comes.
- self._add_directory(include_dirs, "/usr/local/include")
@@ -51,6 +53,6 @@ index 68945e4..67566e8 100644
self._update_extension("_pillow_heif", ["heif"], extra_compile_args=["-O3", "-Werror"])
+
--
2.39.5
-
similarity index 85%
rename from meta-multimedia/recipes-devtools/python/python3-pillow-heif_1.1.1.bb
rename to meta-multimedia/recipes-devtools/python/python3-pillow-heif_1.5.0.bb
@@ -11,7 +11,7 @@ PYPI_PACKAGE = "pillow_heif"
inherit pypi python_setuptools_build_meta
SRC_URI += "file://0001-setup.py-support-cross-compiling.patch"
-SRC_URI[sha256sum] = "f60e8c8a8928556104cec4fff39d43caa1da105625bdb53b11ce3c89d09b6bde"
+SRC_URI[sha256sum] = "16b11a37b762ff42da2d36527bb5cb14bd9194c24c389ee911155d6e23c53065"
DEPENDS += "libheif"
Upstream changes (release notes): * 1.2.0: dropped Python 3.9; PREFERRED_DECODER must be a valid decoder. * 1.3.0: pixel-aspect-ratio (pasp) read/write; free-threaded (no-GIL) Python support; fix integer overflow in the encode path leading to a heap OOB read (CVE-2026-28231). * 1.4.0: track newer bundled libheif/libde265/libx265 (not used here - the recipe builds against the system libraries); minimum libheif raised to 1.19.0. * 1.5.0: grid (tiled) image encoding via options.GRID_TILE_SIZE / tile_size, info["tiling"] read-back, and PH_LIBHEIF_CMAKE_ARGS. Refresh 0001-setup.py-support-cross-compiling.patch for 1.5.0: setup.py context shifted, so the patch applied with fuzz and failed the patch-fuzz QA check. Regenerated against 1.5.0 (same STAGING_INCDIR/STAGING_LIBDIR changes). Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- .../0001-setup.py-support-cross-compiling.patch | 12 +++++++----- ...ow-heif_1.1.1.bb => python3-pillow-heif_1.5.0.bb} | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) rename meta-multimedia/recipes-devtools/python/{python3-pillow-heif_1.1.1.bb => python3-pillow-heif_1.5.0.bb} (85%)