[Buildroot] [PATCH 1/1] package/librsvg: optionally build the SVG GDK pixbuf plugin
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Sep 25 19:45:16 UTC 2019
Thomas, All,
On 2019-09-25 19:27 +0000, Thomas Lorblanchès spake thusly:
> Enable generation of libpixbufloader-svg.so if gdk-pixbuf is enabled
Thank you for following up with this patch after our IRC discussion. :-)
> Signed-off-by: Thomas Lorblanchès <zlika_ese at hotmail.com>
> ---
> package/librsvg/librsvg.mk | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
> index 4f563ce6db..746b339bdd 100644
> --- a/package/librsvg/librsvg.mk
> +++ b/package/librsvg/librsvg.mk
> @@ -9,7 +9,10 @@ LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20
> LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
> LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
> LIBRSVG_INSTALL_STAGING = YES
> -LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no
> +LIBRSVG_CONF_OPTS = --disable-tools --enable-introspection=no
> +ifneq ($(BR2_PACKAGE_GDK_PIXBUF),y)
> +LIBRSVG_CONF_OPTS += --disable-pixbuf-loader
> +endif
Usually, we prefer positive logic (when possible), and we also prefer
that the disabling and enabling both be explicit. Also, you have to
ensure the build order with a proper:
ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y)
LIBRSVG_DEPENDENCIES += gdk-pixbuf
LIBRSVG_CONF_OPTS += --enable-pixbuf-loader
else
LIBRSVG_CONF_OPTS += --disable-pixbuf-loader
endif
However, in this case, gdk-pixbuf is always enabled when librsvg is,
because librsvg select gdb-pixbuf:
https://git.buildroot.org/buildroot/tree/package/librsvg/Config.in#n11
So your change means that gdk-pixbuf-loader can never be disabled.
Furthermore, it seems gdk-pixbuf-loader was explicitly disabled in
7372c80cc (package/librsvg: disable gdk-pixbuf-loader) because it failed
to build. Can you confirm this is now fixed?
> HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
> LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \
Note that you would have to remove gdk-pixbuf from that line, if it is
only needed for gdk-pixbuf-loader.
Regards,
Yann E. MORIN.
> $(if $(BR2_PACKAGE_LIBGTK3),libgtk3)
> --
> 2.11.0
> _______________________________________________
> 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. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list