aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-08-15 13:33:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:05:46 +0100
commitebba8c2999fc6cf94eca988f8d942acd9f0137ba (patch)
tree789a98ffdaffaf2838368abf15f4283c6f50e973 /meta/recipes-gnome
parent0833691ff1d05b17a0c90c90800d7cdaeb871479 (diff)
downloadopenembedded-core-contrib-ebba8c2999fc6cf94eca988f8d942acd9f0137ba.tar.gz
gdk-pixbuf: Upgrade 2.36.6 -> 2.36.8
Smallish releases with bug fixes and minor improvements. shared-mime-info is now always used for image type sniffing. The dependency does not seem to currently be a build-time dependency but configure.ac does check for it: I took the easy route and just added shared-mime-info to DEPENDS as well. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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.36.8.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.6.bb)11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb
index fe3e63620da..3d16ee0d8ca 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.6.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
SECTION = "libs"
-DEPENDS = "glib-2.0 gdk-pixbuf-native"
+DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -21,8 +21,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-queryloaders-Make-output-more-reproducible.patch \
"
-SRC_URI[md5sum] = "5dd53760750670d27c194ff6ace7eb51"
-SRC_URI[sha256sum] = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c"
+SRC_URI[md5sum] = "e0aaa0061eb12667b32b27472230b962"
+SRC_URI[sha256sum] = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
@@ -39,12 +39,13 @@ 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"
PACKAGES =+ "${PN}-xlib"
+# For GIO image type sniffing
+RDEPENDS_${PN} = "shared-mime-info"
+
FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
ALLOW_EMPTY_${PN}-xlib = "1"