[PATCH 1/2] pixbufcache: Ensure sysroot dependencies are satisfied

[Kyle Russell <bkylerussell@gmail.com>]

Reverts part of b411085fefc8582d24c172db5f6610705eb44c2f

Makes sure gdk-pixbuf-native populates the sysroot during setscene;
otherwise, gdk-pixbuf-query-loaders may not actually be available at the
time the completion function runs, causing a build failure.

Similarly, packages providing loader libraries should append to
PIXBUFCACHE_SYSROOT_DEPS with their runtime dependencies.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 meta/classes/pixbufcache.bbclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index dbe11e1..3c1e398 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -65,3 +65,17 @@ pixbufcache_sstate_postinst() {
 	fi
 }
 
+# Add all of the dependencies of gdk-pixbuf as dependencies of
+# do_populate_sysroot_setscene so that pixbufcache_sstate_postinst can work
+# (otherwise gdk-pixbuf-query-loaders may not exist or link). Only add
+# gdk-pixbuf-native if we're not building gdk-pixbuf itself.
+#
+# Packages that use this class should extend this variable with their runtime
+# dependencies.
+PIXBUFCACHE_SYSROOT_DEPS = ""
+PIXBUFCACHE_SYSROOT_DEPS_class-native = "\
+    ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} \
+"
+
+do_populate_sysroot_setscene[depends] += "${PIXBUFCACHE_SYSROOT_DEPS}"
+do_populate_sysroot[depends] += "${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')}"
-- 
2.7.4