Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support

[Julien Olivain <ju.o@free.fr>]

Hi Yann,

On 31/05/2024 22:10, Yann E. MORIN wrote:
> Julien, All,
> 
> On 2024-05-31 21:40 +0200, Julien Olivain spake thusly:
>> Signed-off-by: Julien Olivain <ju.o@free.fr>
>> ---
>>  package/octave/octave.mk | 10 ++++++++++
>>  1 file changed, 10 insertions(+)
>> 
>> diff --git a/package/octave/octave.mk b/package/octave/octave.mk
>> index a087961be97..6a21bef7b87 100644
>> --- a/package/octave/octave.mk
>> +++ b/package/octave/octave.mk
>> @@ -26,6 +26,16 @@ else
>>  OCTAVE_CONF_OPTS += --without-bz2
>>  endif
>> 
>> +ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y)
>> +OCTAVE_CONF_OPTS += --with-magick=GraphicsMagick++
>> +OCTAVE_DEPENDENCIES += graphicsmagick
>> +else ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y)
>> +OCTAVE_CONF_OPTS += --with-magick=ImageMagick++
>> +OCTAVE_DEPENDENCIES += imagemagick
>> +else
>> +OCTAVE_CONF_OPTS += --without-magick
> 
> This is material for the next branch, so should we just add
> --without-magick on master, for correctness?

To me, this is another instance of the grey zone between what goes in
"master" and "next". Peter accepted the same kind of commit in master:
https://gitlab.com/buildroot.org/buildroot/-/commit/c1723c0dfda041efb3da1d4da94909cbc0003e77

The branch "next" was already opened.

I understood that such a change is then a "fix" of Octave
automatically detecting the presence of those dependencies. The build
is not broken. It is just the support that might be enabled or not,
depending on the build order.

So I don't think there is a big differences between applying this patch
on master, or next. You can also apply on master after the 2024.05 tag.
If you apply now on next and disable on master, we will need to also
update (or resolve a conflict) while the merge next in master.

Tell me what you prefer, I'll send a v2 if needed.

> Regards,
> Yann E. MORIN.
> 
>> +endif
>> +
>>  ifeq ($(BR2_PACKAGE_READLINE),y)
>>  OCTAVE_CONF_OPTS += \
>>  	--enable-readline \
>> --
>> 2.45.1
>> 
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/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.  |
> '------------------------------^-------^------------------^--------------------'

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot