summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:52:29 +0000
commitc70d167451b2ef1e5bde7252329c9a7f21033a2f (patch)
treeadadb378bc534c83a1f6b02d6a4f86cdad07e401 /meta
parent2b2416098eaf6f98ebe22c86e550d648edcb90f2 (diff)
downloadpoky-c70d167451b2ef1e5bde7252329c9a7f21033a2f.tar.gz
gdk-pixbuf: use the new pixbufcache class
[YOCTO #3582] (From OE-Core rev: f6dce5376894d4ac91f01a85cffc828678695b04) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb48
1 files changed, 3 insertions, 45 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 64f1450aeb..cc2ea50e57 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
@@ -20,9 +20,9 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${
20SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" 20SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0"
21SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84" 21SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
22 22
23PR = "r0" 23PR = "r1"
24 24
25inherit autotools pkgconfig gettext 25inherit autotools pkgconfig gettext pixbufcache
26 26
27LIBV = "2.10.0" 27LIBV = "2.10.0"
28 28
@@ -56,48 +56,6 @@ FILES_${PN}-dbg += " \
56 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ 56 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \
57" 57"
58 58
59postinst_pixbufloader () {
60if [ "x$D" != "x" ]; then
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 $(ls -d -1 $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.so |\
67 sed -e "s:$D:$NATIVE_ROOT:g") > \
68 $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
69 2>$D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.err
70
71# gdk-pixbuf-query-loaders always returns 0, so we need to check if loaders.err
72# has anything in it
73if [ -s $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.err ]; then
74 echo "${PN} postinstall scriptlet failed:"
75 cat $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.err
76 rm $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.err
77 # we've got errors, postpone postinstall for first boot
78 exit 1
79fi
80
81sed -i -e "s:$NATIVE_ROOT:/:g" $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
82
83# remove the empty loaders.err
84rm $D/${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.err
85
86exit 0
87fi
88
89# Update the pixbuf loaders in case they haven't been registered yet
90GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
91
92if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
93 for icondir in /usr/share/icons/*; do
94 if [ -d ${icondir} ]; then
95 gtk-update-icon-cache -t -q ${icondir}
96 fi
97 done
98fi
99}
100
101PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" 59PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
102PACKAGES_DYNAMIC_class-native = "" 60PACKAGES_DYNAMIC_class-native = ""
103 61
@@ -106,7 +64,7 @@ python populate_packages_prepend () {
106 64
107 loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') 65 loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders')
108 66
109 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) 67 d.setVar('PIXBUF_PACKAGES', ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')))
110} 68}
111 69
112do_install_append_class-native() { 70do_install_append_class-native() {