[Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support

[Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support

[Fabrice Fontaine]

lcms2 is an optional dependency since version 2.3.0 and
https://github.com/python-pillow/Pillow/commit/6d9f34914021951bba42ffe5b6cd80147e7f538f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-pillow/python-pillow.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index f71fa156e2..3018758b48 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -28,6 +28,13 @@ else
 PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+PYTHON_PILLOW_DEPENDENCIES += lcms2
+PYTHON_PILLOW_BUILD_OPTS += --enable-lcms
+else
+PYTHON_PILLOW_BUILD_OPTS += --disable-lcms
+endif
+
 ifeq ($(BR2_PACKAGE_OPENJPEG),y)
 PYTHON_PILLOW_DEPENDENCIES += openjpeg
 PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000
-- 
2.30.2

[Buildroot] [PATCH 2/4] package/python-pillow: add xcb support

[Fabrice Fontaine]

libxcb is an optional dependency since version 7.1.0 and
https://github.com/python-pillow/Pillow/commit/3c39e6fcf6a11b18eec0d1c66710bcd35033d069

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-pillow/python-pillow.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 3018758b48..ab52f38df1 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -35,6 +35,13 @@ else
 PYTHON_PILLOW_BUILD_OPTS += --disable-lcms
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXCB),y)
+PYTHON_PILLOW_DEPENDENCIES += libxcb
+PYTHON_PILLOW_BUILD_OPTS += --enable-xcb
+else
+PYTHON_PILLOW_BUILD_OPTS += --disable-xcb
+endif
+
 ifeq ($(BR2_PACKAGE_OPENJPEG),y)
 PYTHON_PILLOW_DEPENDENCIES += openjpeg
 PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000
-- 
2.30.2

[Buildroot] [PATCH 2/4] package/python-pillow: add xcb support

[Yann E. MORIN]

Fabrice, All,

On 2021-05-22 19:41 +0200, Fabrice Fontaine spake thusly:
> libxcb is an optional dependency since version 7.1.0 and
> https://github.com/python-pillow/Pillow/commit/3c39e6fcf6a11b18eec0d1c66710bcd35033d069
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

This is fixing a hiodden dependency, so: applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/python-pillow/python-pillow.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
> index 3018758b48..ab52f38df1 100644
> --- a/package/python-pillow/python-pillow.mk
> +++ b/package/python-pillow/python-pillow.mk
> @@ -35,6 +35,13 @@ else
>  PYTHON_PILLOW_BUILD_OPTS += --disable-lcms
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBXCB),y)
> +PYTHON_PILLOW_DEPENDENCIES += libxcb
> +PYTHON_PILLOW_BUILD_OPTS += --enable-xcb
> +else
> +PYTHON_PILLOW_BUILD_OPTS += --disable-xcb
> +endif
> +
>  ifeq ($(BR2_PACKAGE_OPENJPEG),y)
>  PYTHON_PILLOW_DEPENDENCIES += openjpeg
>  PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/4] package/python-pillow: add xcb support

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > libxcb is an optional dependency since version 7.1.0 and
 > https://github.com/python-pillow/Pillow/commit/3c39e6fcf6a11b18eec0d1c66710bcd35033d069

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/4] package/python-pillow: add webpmux support

[Fabrice Fontaine]

webpmux is an optional dependency since version 2.2.0 and
https://github.com/python-pillow/Pillow/commit/b4735f7829bb88c99071cd91b208aa6ffd2cba24

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-pillow/python-pillow.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index ab52f38df1..61f386df07 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -63,6 +63,12 @@ else
 PYTHON_PILLOW_BUILD_OPTS += --disable-webp
 endif
 
+ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy)
+PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux
+else
+PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux
+endif
+
 define PYTHON_PILLOW_BUILD_CMDS
 	cd $(PYTHON_PILLOW_BUILDDIR); \
 		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
-- 
2.30.2

[Buildroot] [PATCH 3/4] package/python-pillow: add webpmux support

[Yann E. MORIN]

Fabrice, All,

On 2021-05-22 19:41 +0200, Fabrice Fontaine spake thusly:
> webpmux is an optional dependency since version 2.2.0 and
> https://github.com/python-pillow/Pillow/commit/b4735f7829bb88c99071cd91b208aa6ffd2cba24
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

This is not fixing a hidden dependency, however;
  - I have not checked what the default is, so maybe it does fix a
    hidden dependency after all,
  - it got pulled as pat of the rest of the series,
  - and I had to do some changes, see below...

> ---
>  package/python-pillow/python-pillow.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
> index ab52f38df1..61f386df07 100644
> --- a/package/python-pillow/python-pillow.mk
> +++ b/package/python-pillow/python-pillow.mk
> @@ -63,6 +63,12 @@ else
>  PYTHON_PILLOW_BUILD_OPTS += --disable-webp
>  endif
>  
> +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy)
> +PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux
> +else
> +PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux
> +endif

I was confused to not see a dependency on webp itself, but it is already
there. It;s just that this new conditional was not in the existing
webp-conditional block.

So, I moved the new check inside the existing webp-conditional block,
added an explicit disable for webpmux in the else clause, and applied
to master, thanks.

Regards,
Yann E. MORIN.

>  define PYTHON_PILLOW_BUILD_CMDS
>  	cd $(PYTHON_PILLOW_BUILDDIR); \
>  		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/4] package/python-pillow: add webpmux support

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > webpmux is an optional dependency since version 2.2.0 and
 > https://github.com/python-pillow/Pillow/commit/b4735f7829bb88c99071cd91b208aa6ffd2cba24

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/4] package/python-pillow: security bump to version 8.2.0

[Fabrice Fontaine]

- Fix numerous CVEs:
  https://pillow.readthedocs.io/en/stable/releasenotes/8.2.0.html#security
  https://pillow.readthedocs.io/en/stable/releasenotes/8.1.2.html#security
  https://pillow.readthedocs.io/en/stable/releasenotes/8.1.1.html#security
  https://pillow.readthedocs.io/en/stable/releasenotes/8.1.0.html#security
- Update license to HPND:
  https://github.com/python-pillow/Pillow/commit/81078e8a0d26c9094446a64aadfa8047b8af3484

https://pillow.readthedocs.io/en/stable/releasenotes/index.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-pillow/python-pillow.hash | 7 ++++---
 package/python-pillow/python-pillow.mk   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 0849577f66..562cb2c1a2 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,4 +1,5 @@
-# md5, sha256 from https://pypi.org/project/Pillow/
-sha256	11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e  Pillow-8.0.1.tar.gz
+# md5, sha256 from https://pypi.org/pypi/pillow/json
+md5  21c03274a9f59b9c00419852a8faebe7  Pillow-8.2.0.tar.gz
+sha256	a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1  Pillow-8.2.0.tar.gz
 # Locally computed sha256 checksums
-sha256	37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81  LICENSE
+sha256	5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4  LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 61f386df07..9529f54633 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_PILLOW_VERSION = 8.0.1
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1
+PYTHON_PILLOW_VERSION = 8.2.0
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f
 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_LICENSE = PIL Software License
+PYTHON_PILLOW_LICENSE = HPND
 PYTHON_PILLOW_LICENSE_FILES = LICENSE
 PYTHON_PILLOW_CPE_ID_VENDOR = python
 PYTHON_PILLOW_CPE_ID_PRODUCT = pillow
-- 
2.30.2

[Buildroot] [PATCH 4/4] package/python-pillow: security bump to version 8.2.0

[Yann E. MORIN]

Fabrice, all,

On 2021-05-22 19:41 +0200, Fabrice Fontaine spake thusly:
> - Fix numerous CVEs:
>   https://pillow.readthedocs.io/en/stable/releasenotes/8.2.0.html#security
>   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.2.html#security
>   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.1.html#security
>   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.0.html#security
> - Update license to HPND:
>   https://github.com/python-pillow/Pillow/commit/81078e8a0d26c9094446a64aadfa8047b8af3484
> 
> https://pillow.readthedocs.io/en/stable/releasenotes/index.html
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/python-pillow/python-pillow.hash | 7 ++++---
>  package/python-pillow/python-pillow.mk   | 6 +++---
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
> index 0849577f66..562cb2c1a2 100644
> --- a/package/python-pillow/python-pillow.hash
> +++ b/package/python-pillow/python-pillow.hash
> @@ -1,4 +1,5 @@
> -# md5, sha256 from https://pypi.org/project/Pillow/
> -sha256	11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e  Pillow-8.0.1.tar.gz
> +# md5, sha256 from https://pypi.org/pypi/pillow/json
> +md5  21c03274a9f59b9c00419852a8faebe7  Pillow-8.2.0.tar.gz
> +sha256	a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1  Pillow-8.2.0.tar.gz
>  # Locally computed sha256 checksums
> -sha256	37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81  LICENSE
> +sha256	5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4  LICENSE
> diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
> index 61f386df07..9529f54633 100644
> --- a/package/python-pillow/python-pillow.mk
> +++ b/package/python-pillow/python-pillow.mk
> @@ -4,10 +4,10 @@
>  #
>  ################################################################################
>  
> -PYTHON_PILLOW_VERSION = 8.0.1
> -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1
> +PYTHON_PILLOW_VERSION = 8.2.0
> +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f
>  PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
> -PYTHON_PILLOW_LICENSE = PIL Software License
> +PYTHON_PILLOW_LICENSE = HPND
>  PYTHON_PILLOW_LICENSE_FILES = LICENSE
>  PYTHON_PILLOW_CPE_ID_VENDOR = python
>  PYTHON_PILLOW_CPE_ID_PRODUCT = pillow
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4/4] package/python-pillow: security bump to version 8.2.0

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - Fix numerous CVEs:
 >   https://pillow.readthedocs.io/en/stable/releasenotes/8.2.0.html#security
 >   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.2.html#security
 >   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.1.html#security
 >   https://pillow.readthedocs.io/en/stable/releasenotes/8.1.0.html#security
 > - Update license to HPND:
 >   https://github.com/python-pillow/Pillow/commit/81078e8a0d26c9094446a64aadfa8047b8af3484

 > https://pillow.readthedocs.io/en/stable/releasenotes/index.html

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support

[Yann E. MORIN]

Fabrice, All,

On 2021-05-22 19:41 +0200, Fabrice Fontaine spake thusly:
> lcms2 is an optional dependency since version 2.3.0 and
> https://github.com/python-pillow/Pillow/commit/6d9f34914021951bba42ffe5b6cd80147e7f538f
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

This is fixing a hidden depenency, so: applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/python-pillow/python-pillow.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
> index f71fa156e2..3018758b48 100644
> --- a/package/python-pillow/python-pillow.mk
> +++ b/package/python-pillow/python-pillow.mk
> @@ -28,6 +28,13 @@ else
>  PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LCMS2),y)
> +PYTHON_PILLOW_DEPENDENCIES += lcms2
> +PYTHON_PILLOW_BUILD_OPTS += --enable-lcms
> +else
> +PYTHON_PILLOW_BUILD_OPTS += --disable-lcms
> +endif
> +
>  ifeq ($(BR2_PACKAGE_OPENJPEG),y)
>  PYTHON_PILLOW_DEPENDENCIES += openjpeg
>  PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > lcms2 is an optional dependency since version 2.3.0 and
 > https://github.com/python-pillow/Pillow/commit/6d9f34914021951bba42ffe5b6cd80147e7f538f

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard