From a97a592a7308991f660b0004fa9757390888e23f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 31 Oct 2024 16:15:35 -0600 Subject: [PATCH] package/python-pillow: fix webp DependencyException As of baa3db0c34e826cc1c6469fd8ecbfbc5c2ef2e2c webp mux/demux are no longer optional for webp support in python-pillow. The -Cwebpmux=enable/disable option no longer exists. Fixes: DependencyException: The headers or library files could not be found for webp, which was requested by the option flag --enable-webp Fixes: baa3db0c34e826cc1c6469fd8ecbfbc5c2ef2e2c Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pillow/python-pillow.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index e87c817c68..ed2668f03c 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -58,16 +58,11 @@ else PYTHON_PILLOW_BUILD_OPTS += -Ctiff=disable endif -ifeq ($(BR2_PACKAGE_WEBP),y) +ifeq ($(BR2_PACKAGE_WEBP)$(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yyy) PYTHON_PILLOW_DEPENDENCIES += webp PYTHON_PILLOW_BUILD_OPTS += -Cwebp=enable -ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += -Cwebpmux=enable else -PYTHON_PILLOW_BUILD_OPTS += -Cwebpmux=disable -endif -else -PYTHON_PILLOW_BUILD_OPTS += -Cwebp=disable -Cwebpmux=disable +PYTHON_PILLOW_BUILD_OPTS += -Cwebp=disable endif $(eval $(python-package))