summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-17 09:54:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:38 +0100
commitdb95e613e61d764ed51ddc76c94e8b06586a98bb (patch)
tree113f3a15798de28ac64254283c1ca800db50250b /meta/recipes-gnome/gdk-pixbuf
parent204b92c663b1a8561ab683ecc2a89b55f2e37570 (diff)
downloadpoky-db95e613e61d764ed51ddc76c94e8b06586a98bb.tar.gz
gdk-pixbuf: remove native loader cache generation, use the class
We assumed that the only relevant gdk-pixbuf loaders in the native environment were the ones in gdk-pixbuf itself, as the icon cache is only for PNG files. However, glib-compile-resources can transform SVG files to raw image data, and done natively this requires the SVG loader to be registered. The current implementation relies on this assumption by generating the cache based on the staging directory during install, so if gdk-pixbuf-native is re-installed to the sysroot after librsvg-native it will overwrite the loader cache. So, remove the code in do_install that updated the cache, and rely on the new logic in pixbufcache.bbclass that updates the cache when it's installed into the sysroot itself. (From OE-Core rev: 3a7625c23b3fbd163dcd4036767b194438ec238d) Signed-off-by: Ross Burton <ross.burton@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/gdk-pixbuf')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
index b35f7c666a..b85bbaf58c 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
@@ -69,9 +69,6 @@ python populate_packages_prepend () {
69} 69}
70 70
71do_install_append_class-native() { 71do_install_append_class-native() {
72#Use wrapper script rather than binary as required libtool library is not installed now
73 GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
74 sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
75 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; 72 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
76 73
77 create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ 74 create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \