summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-09-18 18:59:54 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:09 +0000
commit97648976164e0efaf67c9928f85db5e7cea4378e (patch)
treea7f7d7a04ac9374f9109452378f2e9fb4951bc61 /meta/recipes-gnome
parentdec1e7fdcee5980202c36cb43597fc9110103312 (diff)
downloadpoky-97648976164e0efaf67c9928f85db5e7cea4378e.tar.gz
gdk-pixbuf: generate the pixbuf loader's cache ar rootfs time
This will generate the loaders.cache file for pixbuf, at rootfs time. (From OE-Core rev: 5ba420bc0e282a1cbf000ce32034ad7ab15c01d5) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.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.24.1.bb17
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 65a2d68fd1..2377d0eec1 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -58,9 +58,21 @@ FILES_${PN}-dbg += " \
58 58
59postinst_pixbufloader () { 59postinst_pixbufloader () {
60if [ "x$D" != "x" ]; then 60if [ "x$D" != "x" ]; then
61 exit 1 61# Update the target's pixbuf loader's cache. Since the native binary will
62# throw an error if the shared objects do not belong to the same ELF class,
63# we trick the gdk-pixbuf-query-loaders into scanning the native shared
64# objects and then we remove the NATIVE_ROOT prefix from the paths in
65# loaders.cache.
66gdk-pixbuf-query-loaders $(find $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders \
67 -name *.so | sed -e "s:$D:$NATIVE_ROOT:g") > \
68 $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache || exit 1
69
70sed -i -e "s:$NATIVE_ROOT:/:g" $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
71
72exit 0
62fi 73fi
63 74
75# Update the pixbuf loaders in case they haven't been registered yet
64GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache 76GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
65 77
66if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then 78if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
@@ -93,6 +105,7 @@ do_install_append_class-native() {
93 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 105 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
94 106
95 create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ 107 create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \
96 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 108 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
109 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
97} 110}
98BBCLASSEXTEND = "native" 111BBCLASSEXTEND = "native"