All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency
@ 2021-04-04 14:30 Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 2/7] package/libvips: add librsvg " Fabrice Fontaine
                   ` (7 more replies)
  0 siblings, 8 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

zlib is an optional dependency which is enabled by default since version
8.4.2 and
https://github.com/libvips/libvips/commit/5ab0001ec68a5f61396aecd8d2d7a619b1dbe1fa

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 0449751380..5f95fc7f1d 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -94,4 +94,11 @@ else
 LIBVIPS_CONF_OPTS += --without-libexif
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBVIPS_CONF_OPTS += --with-zlib
+LIBVIPS_DEPENDENCIES += zlib
+else
+LIBVIPS_CONF_OPTS += --without-zlib
+endif
+
 $(eval $(autotools-package))
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 2/7] package/libvips: add librsvg optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 19:58   ` Peter Korsgaard
  2021-04-04 14:30 ` [Buildroot] [PATCH 3/7] package/libvips: add {image, graphics}magick optional dependencies Fabrice Fontaine
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

librsvg is an optional dependency which is enabled by default since
version 8.3.0 and
https://github.com/libvips/libvips/commit/153886d2eb71eebcdca860cb691d8fbb976ad816

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 5f95fc7f1d..f35a109502 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -66,6 +66,13 @@ else
 LIBVIPS_CONF_OPTS += --without-png
 endif
 
+ifeq ($(BR2_PACKAGE_LIBRSVG),y)
+LIBVIPS_CONF_OPTS += --with-rsvg
+LIBVIPS_DEPENDENCIES += librsvg
+else
+LIBVIPS_CONF_OPTS += --without-rsvg
+endif
+
 ifeq ($(BR2_PACKAGE_POPPLER),y)
 LIBVIPS_CONF_OPTS += --with-poppler
 LIBVIPS_DEPENDENCIES += poppler
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 3/7] package/libvips: add {image, graphics}magick optional dependencies
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 2/7] package/libvips: add librsvg " Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 4/7] package/libvips: add orc optional dependency Fabrice Fontaine
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libvips/libvips.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index f35a109502..7e8b705dd2 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -23,7 +23,6 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \
 LIBVIPS_CONF_OPTS = \
 	--without-dmalloc \
 	--without-gsf \
-	--without-magick \
 	--without-orc \
 	--without-lcms \
 	--without-OpenEXR \
@@ -52,6 +51,20 @@ else
 LIBVIPS_CONF_OPTS += --disable-introspection
 endif
 
+ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y)
+LIBVIPS_CONF_OPTS += \
+	--with-magick \
+	--with-magickpackage=MagickCore
+LIBVIPS_DEPENDENCIES += imagemagick
+else ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y)
+LIBVIPS_CONF_OPTS += \
+	--with-magick \
+	--with-magickpackage=GraphicsMagick
+LIBVIPS_DEPENDENCIES += graphicsmagick
+else
+LIBVIPS_CONF_OPTS += --without-magick
+endif
+
 ifeq ($(BR2_PACKAGE_JPEG),y)
 LIBVIPS_CONF_OPTS += --with-jpeg
 LIBVIPS_DEPENDENCIES += jpeg
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 4/7] package/libvips: add orc optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 2/7] package/libvips: add librsvg " Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 3/7] package/libvips: add {image, graphics}magick optional dependencies Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 5/7] package/libvips: add lcms2 " Fabrice Fontaine
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 7e8b705dd2..304861ab83 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -23,7 +23,6 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \
 LIBVIPS_CONF_OPTS = \
 	--without-dmalloc \
 	--without-gsf \
-	--without-orc \
 	--without-lcms \
 	--without-OpenEXR \
 	--without-openslide \
@@ -86,6 +85,13 @@ else
 LIBVIPS_CONF_OPTS += --without-rsvg
 endif
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+LIBVIPS_CONF_OPTS += --with-orc
+LIBVIPS_DEPENDENCIES += orc
+else
+LIBVIPS_CONF_OPTS += --without-orc
+endif
+
 ifeq ($(BR2_PACKAGE_POPPLER),y)
 LIBVIPS_CONF_OPTS += --with-poppler
 LIBVIPS_DEPENDENCIES += poppler
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 5/7] package/libvips: add lcms2 optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
                   ` (2 preceding siblings ...)
  2021-04-04 14:30 ` [Buildroot] [PATCH 4/7] package/libvips: add orc optional dependency Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 6/7] package/libvips: add matio " Fabrice Fontaine
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 304861ab83..494392de7b 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -23,7 +23,6 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \
 LIBVIPS_CONF_OPTS = \
 	--without-dmalloc \
 	--without-gsf \
-	--without-lcms \
 	--without-OpenEXR \
 	--without-openslide \
 	--without-matio \
@@ -71,6 +70,13 @@ else
 LIBVIPS_CONF_OPTS += --without-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+LIBVIPS_CONF_OPTS += --with-lcms
+LIBVIPS_DEPENDENCIES += lcms2
+else
+LIBVIPS_CONF_OPTS += --without-lcms
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 LIBVIPS_CONF_OPTS += --with-png
 LIBVIPS_DEPENDENCIES += libpng
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 6/7] package/libvips: add matio optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
                   ` (3 preceding siblings ...)
  2021-04-04 14:30 ` [Buildroot] [PATCH 5/7] package/libvips: add lcms2 " Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 14:30 ` [Buildroot] [PATCH 7/7] package/libvips: add webp " Fabrice Fontaine
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 494392de7b..990d3f386f 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -25,7 +25,6 @@ LIBVIPS_CONF_OPTS = \
 	--without-gsf \
 	--without-OpenEXR \
 	--without-openslide \
-	--without-matio \
 	--without-cfitsio \
 	--without-libwebp \
 	--without-pangoft2 \
@@ -91,6 +90,13 @@ else
 LIBVIPS_CONF_OPTS += --without-rsvg
 endif
 
+ifeq ($(BR2_PACKAGE_MATIO),y)
+LIBVIPS_CONF_OPTS += --with-matio
+LIBVIPS_DEPENDENCIES += matio
+else
+LIBVIPS_CONF_OPTS += --without-matio
+endif
+
 ifeq ($(BR2_PACKAGE_ORC),y)
 LIBVIPS_CONF_OPTS += --with-orc
 LIBVIPS_DEPENDENCIES += orc
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 7/7] package/libvips: add webp optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
                   ` (4 preceding siblings ...)
  2021-04-04 14:30 ` [Buildroot] [PATCH 6/7] package/libvips: add matio " Fabrice Fontaine
@ 2021-04-04 14:30 ` Fabrice Fontaine
  2021-04-04 14:45 ` [Buildroot] [PATCH 1/7] package/libvips: add zlib " Thomas Petazzoni
  2021-04-04 19:58 ` Peter Korsgaard
  7 siblings, 0 replies; 10+ messages in thread
From: Fabrice Fontaine @ 2021-04-04 14:30 UTC (permalink / raw)
  To: buildroot

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

diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 990d3f386f..7023b11119 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -26,7 +26,6 @@ LIBVIPS_CONF_OPTS = \
 	--without-OpenEXR \
 	--without-openslide \
 	--without-cfitsio \
-	--without-libwebp \
 	--without-pangoft2 \
 	--without-x
 LIBVIPS_INSTALL_STAGING = YES
@@ -132,6 +131,13 @@ else
 LIBVIPS_CONF_OPTS += --without-libexif
 endif
 
+ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy)
+LIBVIPS_CONF_OPTS += --with-libwebp
+LIBVIPS_DEPENDENCIES += webp
+else
+LIBVIPS_CONF_OPTS += --without-libwebp
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 LIBVIPS_CONF_OPTS += --with-zlib
 LIBVIPS_DEPENDENCIES += zlib
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
                   ` (5 preceding siblings ...)
  2021-04-04 14:30 ` [Buildroot] [PATCH 7/7] package/libvips: add webp " Fabrice Fontaine
@ 2021-04-04 14:45 ` Thomas Petazzoni
  2021-04-04 19:58 ` Peter Korsgaard
  7 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2021-04-04 14:45 UTC (permalink / raw)
  To: buildroot

On Sun,  4 Apr 2021 16:30:42 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> zlib is an optional dependency which is enabled by default since version
> 8.4.2 and
> https://github.com/libvips/libvips/commit/5ab0001ec68a5f61396aecd8d2d7a619b1dbe1fa
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libvips/libvips.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Series applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency
  2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
                   ` (6 preceding siblings ...)
  2021-04-04 14:45 ` [Buildroot] [PATCH 1/7] package/libvips: add zlib " Thomas Petazzoni
@ 2021-04-04 19:58 ` Peter Korsgaard
  7 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2021-04-04 19:58 UTC (permalink / raw)
  To: buildroot

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

 > zlib is an optional dependency which is enabled by default since version
 > 8.4.2 and
 > https://github.com/libvips/libvips/commit/5ab0001ec68a5f61396aecd8d2d7a619b1dbe1fa

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

Committed to 2020.02.x, 2020.11.x and 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 2/7] package/libvips: add librsvg optional dependency
  2021-04-04 14:30 ` [Buildroot] [PATCH 2/7] package/libvips: add librsvg " Fabrice Fontaine
@ 2021-04-04 19:58   ` Peter Korsgaard
  0 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2021-04-04 19:58 UTC (permalink / raw)
  To: buildroot

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

 > librsvg is an optional dependency which is enabled by default since
 > version 8.3.0 and
 > https://github.com/libvips/libvips/commit/153886d2eb71eebcdca860cb691d8fbb976ad816

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

Committed to 2020.02.x, 2020.11.x and 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-04-04 19:58 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-04 14:30 [Buildroot] [PATCH 1/7] package/libvips: add zlib optional dependency Fabrice Fontaine
2021-04-04 14:30 ` [Buildroot] [PATCH 2/7] package/libvips: add librsvg " Fabrice Fontaine
2021-04-04 19:58   ` Peter Korsgaard
2021-04-04 14:30 ` [Buildroot] [PATCH 3/7] package/libvips: add {image, graphics}magick optional dependencies Fabrice Fontaine
2021-04-04 14:30 ` [Buildroot] [PATCH 4/7] package/libvips: add orc optional dependency Fabrice Fontaine
2021-04-04 14:30 ` [Buildroot] [PATCH 5/7] package/libvips: add lcms2 " Fabrice Fontaine
2021-04-04 14:30 ` [Buildroot] [PATCH 6/7] package/libvips: add matio " Fabrice Fontaine
2021-04-04 14:30 ` [Buildroot] [PATCH 7/7] package/libvips: add webp " Fabrice Fontaine
2021-04-04 14:45 ` [Buildroot] [PATCH 1/7] package/libvips: add zlib " Thomas Petazzoni
2021-04-04 19:58 ` Peter Korsgaard

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.