From 25ef28b14a8e7b8c332ebfeb77f71056801d7214 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 15 Dec 2015 23:40:23 +0100 Subject: [PATCH] package/libevas-generic-loaders: add libraw dependency libraw it's one of the "highly recommended" dependecies according to the README [1]. [1] https://git.enlightenment.org/core/evas_generic_loaders.git/tree/README?id=v1.15.0#n31 Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libevas-generic-loaders/Config.in | 10 ++++++++++ .../libevas-generic-loaders/libevas-generic-loaders.mk | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in index 65ced8a15e..1d5b717977 100644 --- a/package/libevas-generic-loaders/Config.in +++ b/package/libevas-generic-loaders/Config.in @@ -11,6 +11,16 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS +config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW + bool "libraw loader" + depends on BR2_INSTALL_LIBSTDCPP # libraw + select BR2_PACKAGE_LIBRAW + help + This option enables the Evas generic Libraw loader + +comment "libraw loader needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG bool "SVG loader" depends on BR2_USE_MMU # librsvg -> glib2 diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk index 47dfa9a079..2c1c1cddf2 100644 --- a/package/libevas-generic-loaders/libevas-generic-loaders.mk +++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk @@ -14,15 +14,20 @@ LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf libefl zlib -# For now, we only support the SVG loader # poppler >= 0.32 is not supported by the current version of # libevas-generic-loaders. LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \ --disable-poppler \ --disable-spectre \ - --disable-libraw \ --disable-gstreamer +ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW),y) +LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += libraw +LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-libraw +else +LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-libraw +endif + ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y) LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg -- 2.30.2