From fd03e8a682c4dc99c25f9df41b920f8174ed6ded Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Sun, 30 Jan 2011 20:28:58 +0800 Subject: gdk-pixbuf: Fix the native png load error and remove duplicated recipe Native gdk-pixbuf-csource failed to load png file as the "loaders.cache" was not properly set by gdk-pxibuf-query-loaders when install. This patch use the wrapper script rather than query-loaders binary as required libtool library was not installed when do_install_append. Also remove dedicated recipe for gdk-pixbuf-native. [sgw: Added PACKAGES_DYMAMIC_virtclass-native] Signed-off-by: Zhai Edwin Signed-off-by: Saul Wold --- .../gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb | 13 -------- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc | 30 ------------------ meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb | 37 ++++++++++++++++++++-- 3 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb deleted file mode 100644 index 5fabf45830..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require gdk-pixbuf.inc -inherit native - -DEPENDS = "libpng-native gettext-native glib-2.0-native jpeg-native" -PR = "r0" - -PACKAGES_DYNAMIC = "" - -do_install_append() { - GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${D}${bindir}/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache - sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache - find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; -} diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc deleted file mode 100644 index af3383e654..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Image loading library for GTK+" -HOMEPAGE = "http://www.gtk.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9" - -SECTION = "libs" -PRIORITY = "optional" - -DEPENDS = "libpng gettext glib-2.0" - -SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \ - file://hardcoded_libtool.patch;patch=1 \ - file://configure_fix.patch;patch=1 \ - " - -SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556" -SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec" - -inherit autotools pkgconfig - -LIBV = "2.10.0" - -EXTRA_OECONF = "\ - --without-libtiff \ - --with-libpng \ -" - diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb index 8080719884..78f108a0a2 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb @@ -1,9 +1,34 @@ -require gdk-pixbuf.inc +DESCRIPTION = "Image loading library for GTK+" +HOMEPAGE = "http://www.gtk.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" -DEPENDS += "jpeg" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9" +SECTION = "libs" +PRIORITY = "optional" + +DEPENDS = "libpng gettext glib-2.0 jpeg" PR = "r0" +SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \ + file://hardcoded_libtool.patch;patch=1 \ + file://configure_fix.patch;patch=1 \ + " + +SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556" +SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec" + +inherit autotools pkgconfig + +LIBV = "2.10.0" + +EXTRA_OECONF = "\ + --without-libtiff \ + --with-libpng \ +" + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*" @@ -26,6 +51,7 @@ test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/ } PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*" +PACKAGES_DYNAMIC_virtclass-native = "" python populate_packages_prepend () { postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1) @@ -35,3 +61,10 @@ python populate_packages_prepend () { do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) } +do_install_append_virtclass-native() { +#Use wrapper script rather than binary as required libtool library is not installed now + GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache + sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache + find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; +} +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf