diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-01-20 22:45:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-21 10:48:25 +0000 |
| commit | 624e79deb58c08bcc32053e792df140f527d20b1 (patch) | |
| tree | d0ffabe64b7f968f41cfd23fed8f9befdd199f45 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | |
| parent | 992c054c0656efce50d3902b3f0b101ab9ea602a (diff) | |
| download | openembedded-core-contrib-624e79deb58c08bcc32053e792df140f527d20b1.tar.gz | |
gdk-pixbuf: don't forcibly disable GIO sniffing, use PACKAGECONFIG.
There's a configure option for GIO sniffing so don't use a patch to disable it.
Instead use a PACKAGECONFIG for this and default to off, as using GIO for
sniffing means a hard dependency on shared-mime-info.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | 4 |
1 files changed, 3 insertions, 1 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 dd1f27f6b5..4c4d20732e 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 @@ -15,7 +15,6 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://hardcoded_libtool.patch \ - file://configure_fix.patch \ file://extending-libinstall-dependencies.patch \ " @@ -29,6 +28,9 @@ LIBV = "2.10.0" PACKAGECONFIG ??= "" PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG_class-native = "" + +# 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 = "\ |