diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-01-20 22:45:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-21 10:48:25 +0000 |
| commit | aaa3644a75a7698604102b3b68d40b4dcc02df1d (patch) | |
| tree | 6e6f31ef944474a5a3258ca88fc96cf6415e5992 /meta/recipes-gnome | |
| parent | 624e79deb58c08bcc32053e792df140f527d20b1 (diff) | |
| download | openembedded-core-aaa3644a75a7698604102b3b68d40b4dcc02df1d.tar.gz openembedded-core-aaa3644a75a7698604102b3b68d40b4dcc02df1d.tar.bz2 openembedded-core-aaa3644a75a7698604102b3b68d40b4dcc02df1d.zip | |
gdk-pixbuf: use PACKAGECONFIG to control loaders with external dependencies
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb index 4c4d20732e..187af46a99 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ SECTION = "libs" -DEPENDS = "libpng glib-2.0 jpeg" +DEPENDS = "glib-2.0" DEPENDS_append_linuxstdbase = " virtual/libx11" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" @@ -25,19 +25,22 @@ inherit autotools pkgconfig gettext pixbufcache LIBV = "2.10.0" -PACKAGECONFIG ??= "" -PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_class-native = "" +GDK_PIXBUF_LOADERS ?= "png jpeg" + +PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" +PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" +PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" + +PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" +PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg" +PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" +PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" # Use GIO to sniff image format instead of trying all loaders PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" EXTRA_OECONF = "\ - --with-libpng \ - --with-libjpeg \ - --without-libtiff \ - --without-libjasper \ --disable-introspection \ " |