From patchwork Sun Nov 8 15:41:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1396333 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KCakB1CP; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CTdfS741Wz9s1l for ; Mon, 9 Nov 2020 02:42:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 78999860FE; Sun, 8 Nov 2020 15:42:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0LOtaVm0i52l; Sun, 8 Nov 2020 15:42:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 90A4385F8D; Sun, 8 Nov 2020 15:42:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 20D0C1BF588 for ; Sun, 8 Nov 2020 15:42:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 119C387173 for ; Sun, 8 Nov 2020 15:42:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cBFFZpAh+ZUL for ; Sun, 8 Nov 2020 15:42:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0827A87171 for ; Sun, 8 Nov 2020 15:42:02 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id x7so6195544wrl.3 for ; Sun, 08 Nov 2020 07:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MhSv0CGAgkxOhhRptZVdMFrzni0LWkz75Fk9CsPK3sM=; b=KCakB1CPYrFfvPOIPaL+7tc+2TCXP43Zx9pn51jmueUQC4OKrRWSzPPz7GCsGuslfX dvRb9suUiljAAK3PAxCoovpgovoBGM72ZNr82V1BgkW1VA4Ia68J2JFJZw0ARqygO6sF BOmaeFZuBBN2UL8WD9Gqo99d+p48MOm8YRWNnNNYUVXpLsOnQtvjd4+MqSkb65erv4rc MhW87vtGXHtbS+TVkNqp532r7ui0BmnLQc+pjw7q/qPsHSIGwxoQDbimItVndndRyx2J +Xi8KbiHKHdTMuHuL82WBXqgKVWND6nX2mhSd6bcEvOxYd3IHQt6F10/G/8NCT7rW8ua OvbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MhSv0CGAgkxOhhRptZVdMFrzni0LWkz75Fk9CsPK3sM=; b=NCkW91IoSun8XmHUSWYjNkMxeqGyYbzQh/5F5wWLmcDbdaO3CkClIm+hq/1GvKpev9 xbHnHqypuuXqm5jlrkB6rAfaUR01qPKcH75tVy6jWA2EXvbrH8shc4MJWGg0Ghk6Spjm okjCGGgK5MSlcQxZ/8QRtN2K3xHJOThViXLOgX4oFShPwORnwSos0ncyZi4gDCuSFTwy 1AVHd/Adidk0OkgQfyE+fVRNCB8xIICI0GLawicIJGohA5ENTOe8X8+X10cHf/IfV4zk 6UwtO6/hdoTnNZd8GC+djxYy6taSXCK1agfD8yI6yeEUEHOuiQ6yNsxAYQp320fCzcXK HKXw== X-Gm-Message-State: AOAM531GdxO8HV7rI70Dm/Hgt7QpKVGeE7pp7B0726vVZAILDxC9/88E +8fjF12ij+7gDgQcpncrgIzBOgtbpDc9TQ== X-Google-Smtp-Source: ABdhPJwC2G8FUNo5HKm9bncKMOmSjGwvtZmWZYsGsH/KowaFfzHiUZ43KS/brk6K6QfC3WGyHTk3iQ== X-Received: by 2002:adf:de12:: with SMTP id b18mr13766456wrm.187.1604850120226; Sun, 08 Nov 2020 07:42:00 -0800 (PST) Received: from localhost.localdomain (host185127038190.static.fidoka.tech. [185.127.38.190]) by smtp.gmail.com with ESMTPSA id x10sm9684319wrp.62.2020.11.08.07.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 07:41:59 -0800 (PST) From: Angelo Compagnucci X-Google-Original-From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sun, 8 Nov 2020 16:41:48 +0100 Message-Id: <20201108154148.940813-1-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 8.0.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Angelo Compagnucci Bumping the package requires two fixes: * pillow looks for header files in paths returned by pkg-config. On buildroot, pkg-config returns nothing if PKG_CONFIG_ALLOW_SYSTEM_CFLAGS is disabled. * png is the default pillow image format and png format is working only if python zlib module is available. Signed-off-by: Angelo Compagnucci Tested-by: Adam Duskett --- package/python-pillow/Config.in | 1 + package/python-pillow/python-pillow.hash | 3 +-- package/python-pillow/python-pillow.mk | 13 ++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in index f98a4a9e5b..ae6d8c8346 100644 --- a/package/python-pillow/Config.in +++ b/package/python-pillow/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f80b79fe5f..0849577f66 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,5 +1,4 @@ # md5, sha256 from https://pypi.org/project/Pillow/ -md5 f1f7592c51260e5080d3cd71781ea675 Pillow-7.1.2.tar.gz -sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 Pillow-7.2.0.tar.gz +sha256 11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e Pillow-8.0.1.tar.gz # Locally computed sha256 checksums sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 931dce53d2..60a0bb3e1b 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 7.2.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a +PYTHON_PILLOW_VERSION = 8.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE @@ -47,15 +47,9 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -PYTHON_PILLOW_DEPENDENCIES += zlib -PYTHON_PILLOW_BUILD_OPTS += --enable-zlib -else -PYTHON_PILLOW_BUILD_OPTS += --disable-zlib -endif - define PYTHON_PILLOW_BUILD_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) @@ -63,6 +57,7 @@ endef define PYTHON_PILLOW_INSTALL_TARGET_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BUILD_OPTS) install \