summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-02-22 15:02:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:07 +0000
commitb1777d66e3a985eb52c693fe1bcc6333cbcf5cef (patch)
tree4fc06370b8460e6bd017372aa7eb989a082373d6 /meta/recipes-gnome
parent9eff416170cf5a396dc9f4d84dab960dffd8305d (diff)
downloadpoky-b1777d66e3a985eb52c693fe1bcc6333cbcf5cef.tar.gz
gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5
Mostly bug fix releases. Generating the thumbnailer metadata now requires running yet another tool at build time. This is broken for cross-compiling, add a work-around. Add gdk-pixbuf-native to DEPENDS to make the above workaround possible: We already build gdk-pixbuf-native anyway so this is not a huge deal. (From OE-Core rev: 645e14bb39d10a50648daaf7a015f2d75bf357db) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 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/0001-Work-around-thumbnailer-cross-compile-failure.patch47
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb)12
2 files changed, 55 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
new file mode 100644
index 0000000000..31ed988f32
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
@@ -0,0 +1,47 @@
1From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 22 Feb 2017 11:24:39 +0200
4Subject: [PATCH] Work-around thumbnailer cross-compile failure
5
6Install gdk-pixbuf-print-mime-types that's needed for thumbnail
7metadata generation.
8
9Use native gdk-pixbuf-print-mime-types when generating the thumbnail
10metadata. This works but the mime types will come from native
11loader.cache (which will only contain in-tree loaders), not from the
12target loader.cache.
13
14The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
15
16Upstream-Status: Inappropriate [workaround]
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18---
19 thumbnailer/Makefile.am | 7 +++----
20 1 file changed, 3 insertions(+), 4 deletions(-)
21
22diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
23index c9fe123..b0c6c70 100644
24--- a/thumbnailer/Makefile.am
25+++ b/thumbnailer/Makefile.am
26@@ -1,5 +1,4 @@
27-bin_PROGRAMS = gdk-pixbuf-thumbnailer
28-noinst_PROGRAMS = gdk-pixbuf-print-mime-types
29+bin_PROGRAMS = gdk-pixbuf-thumbnailer gdk-pixbuf-print-mime-types
30
31 gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h
32 gdk_pixbuf_thumbnailer_CPPFLAGS = \
33@@ -25,9 +24,9 @@ gdk_pixbuf_print_mime_types_LDADD = \
34
35 thumbnailerdir = $(datadir)/thumbnailers/
36 thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer
37-gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) $(top_builddir)/gdk-pixbuf/loaders.cache
38+gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT)
39 $(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|" \
40- -e "s|\@mimetypes\@|`GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(builddir)/gdk-pixbuf-print-mime-types`|" \
41+ -e "s|\@mimetypes\@|`gdk-pixbuf-print-mime-types`|" \
42 $< > $@
43
44 EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in
45--
462.1.4
47
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
index a188f5473b..7da6d16adb 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
8 8
9SECTION = "libs" 9SECTION = "libs"
10 10
11DEPENDS = "glib-2.0" 11DEPENDS = "glib-2.0 gdk-pixbuf-native"
12 12
13MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 13MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
14 14
@@ -17,10 +17,10 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
17 file://extending-libinstall-dependencies.patch \ 17 file://extending-libinstall-dependencies.patch \
18 file://run-ptest \ 18 file://run-ptest \
19 file://fatal-loader.patch \ 19 file://fatal-loader.patch \
20 file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
20 " 21 "
21 22SRC_URI[md5sum] = "0173fd5c11a5d2030d09201090636477"
22SRC_URI[md5sum] = "fe30b0420e013f2c4590ae6226d895d4" 23SRC_URI[sha256sum] = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc"
23SRC_URI[sha256sum] = "9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38"
24 24
25inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package 25inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
26 26
@@ -53,6 +53,7 @@ FILES_${PN}-bin += "${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer"
53FILES_${PN}-dev += " \ 53FILES_${PN}-dev += " \
54 ${bindir}/gdk-pixbuf-csource \ 54 ${bindir}/gdk-pixbuf-csource \
55 ${bindir}/gdk-pixbuf-pixdata \ 55 ${bindir}/gdk-pixbuf-pixdata \
56 ${bindir}/gdk-pixbuf-print-mime-types \
56 ${includedir}/* \ 57 ${includedir}/* \
57 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \ 58 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
58" 59"
@@ -88,6 +89,9 @@ do_install_append_class-native() {
88 create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ 89 create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \
89 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 90 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
90 91
92 create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \
93 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
94
91 create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ 95 create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
92 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ 96 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
93 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders 97 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders