All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/4] package/python-pillow: add webpmux support
Date: Mon, 24 May 2021 10:56:12 +0200	[thread overview]
Message-ID: <20210524085612.GJ3208066@scaer> (raw)
In-Reply-To: <20210522174159.278657-3-fontaine.fabrice@gmail.com>

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.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2021-05-24  8:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-22 17:41 [Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support Fabrice Fontaine
2021-05-22 17:41 ` [Buildroot] [PATCH 2/4] package/python-pillow: add xcb support Fabrice Fontaine
2021-05-24  8:52   ` Yann E. MORIN
2021-06-08  8:25   ` Peter Korsgaard
2021-05-22 17:41 ` [Buildroot] [PATCH 3/4] package/python-pillow: add webpmux support Fabrice Fontaine
2021-05-24  8:56   ` Yann E. MORIN [this message]
2021-06-08  8:25   ` Peter Korsgaard
2021-05-22 17:41 ` [Buildroot] [PATCH 4/4] package/python-pillow: security bump to version 8.2.0 Fabrice Fontaine
2021-05-24  8:56   ` Yann E. MORIN
2021-06-08  8:25   ` Peter Korsgaard
2021-05-24  8:52 ` [Buildroot] [PATCH 1/4] package/python-pillow: add lcms2 support Yann E. MORIN
2021-06-08  8:25 ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210524085612.GJ3208066@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.