瀏覽代碼

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 <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
James Hilliard 9 月之前
父節點
當前提交
a97a592a73
共有 1 個文件被更改,包括 2 次插入7 次删除
  1. 2 7
      package/python-pillow/python-pillow.mk

+ 2 - 7
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))