From 6dcee71f80073bd15d6a8136821433ed38edc321 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 Jun 2016 14:28:50 +0200 Subject: elementary, evas-generic-loaders: Drop poppler dependency * elementary doesn't seem to use poppler at all * add PACKAGECONFIG for poppler in evas-generic-loaders and disable it by default as ATM poppler is broken Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/elementary.inc | 2 +- meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc index f0a92dfe9a..cec67aa72c 100644 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ b/meta-efl/recipes-efl/efl/elementary.inc @@ -1,7 +1,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a173054a93896e933df53e3382d472c2" -DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb poppler eio" +DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb eio" DEPENDS_class-native = "efl-native" inherit efl gettext diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc index 5cd9ec1882..d277c11679 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -1,20 +1,22 @@ DESCRIPTION = "Evas generic loaders" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a87563ed30add2b0e3460272d3138a00" -DEPENDS = "eina poppler librsvg cairo" +DEPENDS = "eina librsvg cairo" inherit efl SRCNAME = "evas_generic_loaders" EXTRA_OECONF = " \ - --enable-poppler \ --enable-svg \ --disable-gstreamer \ --disable-libraw \ --disable-spectre \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler" + PACKAGESPLITFUNCS_prepend = "split_evas_loader_packages " python split_evas_loader_packages () { -- cgit 1.2.3-korg