* [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support
@ 2024-05-31 19:40 Julien Olivain
2024-05-31 20:10 ` Yann E. MORIN
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Julien Olivain @ 2024-05-31 19:40 UTC (permalink / raw)
To: buildroot; +Cc: Julien Olivain
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
+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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support 2024-05-31 19:40 [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support Julien Olivain @ 2024-05-31 20:10 ` Yann E. MORIN 2024-06-03 18:14 ` Julien Olivain 2024-06-04 21:34 ` Yann E. MORIN 2024-06-08 19:05 ` Peter Korsgaard 2 siblings, 1 reply; 6+ messages in thread From: Yann E. MORIN @ 2024-05-31 20:10 UTC (permalink / raw) To: Julien Olivain; +Cc: buildroot 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? 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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support 2024-05-31 20:10 ` Yann E. MORIN @ 2024-06-03 18:14 ` Julien Olivain 2024-06-03 18:44 ` Yann E. MORIN 0 siblings, 1 reply; 6+ messages in thread From: Julien Olivain @ 2024-06-03 18:14 UTC (permalink / raw) To: Yann E. MORIN; +Cc: buildroot 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support 2024-06-03 18:14 ` Julien Olivain @ 2024-06-03 18:44 ` Yann E. MORIN 0 siblings, 0 replies; 6+ messages in thread From: Yann E. MORIN @ 2024-06-03 18:44 UTC (permalink / raw) To: Julien Olivain; +Cc: buildroot Julien, All, On 2024-06-03 20:14 +0200, Julien Olivain spake thusly: > On 31/05/2024 22:10, Yann E. MORIN wrote: > > On 2024-05-31 21:40 +0200, Julien Olivain spake thusly: > > > +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. Fair enough, that makes sense. No need to respin. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | 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 mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support 2024-05-31 19:40 [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support Julien Olivain 2024-05-31 20:10 ` Yann E. MORIN @ 2024-06-04 21:34 ` Yann E. MORIN 2024-06-08 19:05 ` Peter Korsgaard 2 siblings, 0 replies; 6+ messages in thread From: Yann E. MORIN @ 2024-06-04 21:34 UTC (permalink / raw) To: Julien Olivain; +Cc: buildroot Julien, All, On 2024-05-31 21:40 +0200, Julien Olivain spake thusly: > Signed-off-by: Julien Olivain <ju.o@free.fr> Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 > +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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support 2024-05-31 19:40 [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support Julien Olivain 2024-05-31 20:10 ` Yann E. MORIN 2024-06-04 21:34 ` Yann E. MORIN @ 2024-06-08 19:05 ` Peter Korsgaard 2 siblings, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2024-06-08 19:05 UTC (permalink / raw) To: Julien Olivain; +Cc: buildroot >>>>> "Julien" == Julien Olivain <ju.o@free.fr> writes: > Signed-off-by: Julien Olivain <ju.o@free.fr> Committed to 2024.02.x, thanks. -- Bye, Peter Korsgaard _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-08 19:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-31 19:40 [Buildroot] [PATCH 1/1] package/octave: add optional {Graphics, Image}Magick++ support Julien Olivain
2024-05-31 20:10 ` Yann E. MORIN
2024-06-03 18:14 ` Julien Olivain
2024-06-03 18:44 ` Yann E. MORIN
2024-06-04 21:34 ` Yann E. MORIN
2024-06-08 19:05 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox