gdk-pixbuf: Fix the native png load error and remove duplicated recipe
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): d4ed42c98ddae97ccf3fa42843d7a1ecfbab799c.1296485859.git.edwin.zhai@intel.com
Koen,
I merged gdk-pixbuf & gdk-pixbuf-native, but do_split_packages make gdk-pixbuf-native also provide gdk-pixbuf-loader-xxx then cause multiple providers. Any way to comment it in gdk-pixbuf-native?
RP,
I saw your patch to resolve the multiple providers from gdk-pixbuf and gtk+, and just was curious why not just remove old gtk+ recipes given no others depend on them. Any other concerns?
Thanks,
edwin
===========================================================================================================
NOTE: multiple providers are available for runtime gdk-pixbuf-loader-png (gdk-pixbuf, gdk-pixbuf-native)
NOTE: consider defining a PREFERRED_PROVIDER entry to match gdk-pixbuf-loader-png
NOTE: multiple providers are available for runtime gdk-pixbuf-loader-jpeg (gdk-pixbuf, gdk-pixbuf-native)
NOTE: consider defining a PREFERRED_PROVIDER entry to match gdk-pixbuf-loader-jpeg
NOTE: multiple providers are available for runtime gdk-pixbuf-loader-gif (gdk-pixbuf, gdk-pixbuf-native)
NOTE: consider defining a PREFERRED_PROVIDER entry to match gdk-pixbuf-loader-gif
NOTE: multiple providers are available for runtime gdk-pixbuf-loader-xpm (gdk-pixbuf, gdk-pixbuf-native)
NOTE: consider defining a PREFERRED_PROVIDER entry to match gdk-pixbuf-loader-xpm
Quoted 157 lines · [email protected] wrote:
From: Zhai Edwin <[email protected]>
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.
Signed-off-by Zhai Edwin <[email protected]>--- .../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 | 36 +++++++++++++++++++- 3 files changed, 35 insertions(+), 44 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.incmeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb +0
-0deleted file mode 100644
index 5fabf45..0000000meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb deleted +0
-10@@ -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.cachemeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb deleted +0
-2- find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; -}meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc deleted +0
-6@@ -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"meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc deleted +0
-7- -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 \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc deleted +0
-6- file://hardcoded_libtool.patch;patch=1 \ - file://configure_fix.patch;patch=1 \ - " - -SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556" -SRC_URI[sha256sum] ="
bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec"meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc deleted +0
-10- -inherit autotools pkgconfig - -LIBV = "2.10.0" - -EXTRA_OECONF = "\ - --without-libtiff \ - --with-libpng \ -" -meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +6
-1@@ -1,7 +1,34 @@ -require gdk-pixbuf.inc +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"
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +6
-0+ +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 \
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +6
-0+ file://hardcoded_libtool.patch;patch=1 \ + file://configure_fix.patch;patch=1 \ + " + +SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556" +SRC_URI[sha256sum] ="
bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec"meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +12
-0+ +inherit autotools pkgconfig + +LIBV = "2.10.0" + +EXTRA_OECONF = "\ + --without-libtiff \ + --with-libpng \ +" + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*"@@ -33,3 +60,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 isnot 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.cachemeta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb +3
-0+ find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; +} +BBCLASSEXTEND = "native"Signature · 6 lines
1.7.0.4 _______________________________________________ poky mailing list [email protected] https://lists.yoctoproject.org/listinfo/poky
Quoted 4 lines · Edwin
Koen,
I merged gdk-pixbuf & gdk-pixbuf-native, butdo_split_packagesmake gdk-pixbuf-native also provide gdk-pixbuf-loader-xxx then cause multiple providers. Any way to comment it in gdk-pixbuf-native?
PACKAGES_DYNAMIC_virtclass-native = ""
Quoted 4 lines
RP,
I saw your patch to resolve the multiple providers from gdk-pixbuf and gtk+, and just was curious why not just remove old gtk+ recipes given no others depend on them. Any other concerns?
The old version of gtk+ has some sato patches we've yet to forward port to the newer gtk+. Its something I want to resolve before we delete it.
As an added bonus we uncovered a nasty dependency provider problem in bitbake which was nice to fix.
Cheers,
Richard