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>
This commit is contained in:
parent
204b92c663
commit
db95e613e6
|
@ -69,9 +69,6 @@ python populate_packages_prepend () {
|
|||
}
|
||||
|
||||
do_install_append_class-native() {
|
||||
#Use wrapper script rather than binary as required libtool library is not installed now
|
||||
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
|
||||
sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
|
||||
find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
|
||||
|
||||
create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \
|
||||
|
|
Loading…
Reference in New Issue