From 81387857e8b3685cece0264fffc8d4c13f9cc48c Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Thu, 22 May 2025 15:12:25 +0300 Subject: python3-pillow-heif: Move to meta-multimedia Move from meta-python to meta-multimedia which depends on layer meta-python. This way the recipe will reside in the layer where its main dependency libheif is. This work was sponsored by GOVCERT.LU. Suggested-by: Yoann Congal Signed-off-by: Leon Anavi Signed-off-by: Khem Raj --- .../0001-setup.py-support-cross-compiling.patch | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch (limited to 'meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch') diff --git a/meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch b/meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch deleted file mode 100644 index 66cf7a9244..0000000000 --- a/meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 98e6831754712221ce030ce8b27e100a3926c543 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Mon, 5 May 2025 16:08:37 +0000 -Subject: [PATCH] setup.py: support cross compiling - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Leon Anavi ---- - setup.py | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/setup.py b/setup.py -index 68945e4..67566e8 100644 ---- a/setup.py -+++ b/setup.py -@@ -125,12 +125,12 @@ class PillowHeifBuildExt(build_ext): - self._add_directory(library_dirs, match.group(1)) - - # include, rpath, if set as environment variables -- for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE"): -+ for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE", "STAGING_INCDIR"): - if k in os.environ: - for d in os.environ[k].split(os.path.pathsep): - self._add_directory(include_dirs, d) - -- for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB"): -+ for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB", "STAGING_LIBDIR"): - 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"]) - 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") -- self._add_directory(include_dirs, "/usr/include") -- self._add_directory(library_dirs, "/usr/local/lib") -- self._add_directory(library_dirs, "/usr/lib64") -- self._add_directory(library_dirs, "/usr/lib") -- self._add_directory(library_dirs, "/lib") -+ include_os_path = os.environ.get("STAGING_INCDIR") -+ if include_os_path: -+ for path in include_os_path.split(os.pathsep): -+ self._add_directory(include_dirs, path) -+ -+ lib_os_path = os.environ.get("STAGING_LIBDIR") -+ if lib_os_path: -+ for path in lib_os_path.split(os.pathsep): -+ self._add_directory(library_dirs, path) - - self._update_extension("_pillow_heif", ["heif"], extra_compile_args=["-O3", "-Werror"]) - --- -2.39.5 - -- cgit v1.2.3-54-g00ecf