diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-08-15 13:33:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-17 00:21:14 +0100 |
commit | 91572dc5870f0e216d10bf4e365b96baa80de77a (patch) | |
tree | ade17d402eae181a62ff5648945431b23470c237 /meta | |
parent | 9b63e8247cf5608a1639b14ecbde125d43f5dd59 (diff) | |
download | poky-91572dc5870f0e216d10bf4e365b96baa80de77a.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.
(From OE-Core rev: ebba8c2999fc6cf94eca988f8d942acd9f0137ba)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 fe3e63620d..3d16ee0d8c 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 \ | |||
8 | 8 | ||
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | 10 | ||
11 | DEPENDS = "glib-2.0 gdk-pixbuf-native" | 11 | DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" |
12 | 12 | ||
13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
14 | 14 | ||
@@ -21,8 +21,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
21 | file://0001-queryloaders-Make-output-more-reproducible.patch \ | 21 | file://0001-queryloaders-Make-output-more-reproducible.patch \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI[md5sum] = "5dd53760750670d27c194ff6ace7eb51" | 24 | SRC_URI[md5sum] = "e0aaa0061eb12667b32b27472230b962" |
25 | SRC_URI[sha256sum] = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c" | 25 | SRC_URI[sha256sum] = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19" |
26 | 26 | ||
27 | inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package | 27 | inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package |
28 | 28 | ||
@@ -39,12 +39,13 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg" | |||
39 | PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" | 39 | PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" |
40 | PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" | 40 | PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" |
41 | 41 | ||
42 | # Use GIO to sniff image format instead of trying all loaders | ||
43 | PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" | ||
44 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" | 42 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" |
45 | 43 | ||
46 | PACKAGES =+ "${PN}-xlib" | 44 | PACKAGES =+ "${PN}-xlib" |
47 | 45 | ||
46 | # For GIO image type sniffing | ||
47 | RDEPENDS_${PN} = "shared-mime-info" | ||
48 | |||
48 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" | 49 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" |
49 | ALLOW_EMPTY_${PN}-xlib = "1" | 50 | ALLOW_EMPTY_${PN}-xlib = "1" |
50 | 51 | ||