Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On 01.03.2019 20:15, Stefan Agner wrote: > On 23.02.2019 13:29, Richard Purdie wrote: >> On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote: >>> Drop autotools-specific patches. >>> >>> Rework jku's thumbnailer patch into meson configuration. >>> >>> Signed-off-by: Alexander Kanavin >> >> We've seen it before but its happened again: >> >> https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326 >> >> I went into the failed build directory and ran "bitbake core-image-sato >> -c testsdkext" and it succeeded so I'm not sure sure how we're going to >> debug this one... > > I am not sure if it is related, but we see psplash failing with a custom > png recently. > > failed to load ".../splashscreen-blue.png": Couldn’t recognize the image > file format for file “.../splashscreen-blue.png” > > The psplash calls gdk-pixbuf-csource (through make-image-header.sh). We > only saw it failing when building in a Ubuntu 18.04 container, but then > reproducible. > > I also noticed this (probably unrelated) in do_configure log: > > DEBUG: Executing shell function do_configure > gtkdocize: neither configure.ac nor configure.in exist > NOTE: Executing meson -Denable_jpeg=true -Denable_jasper=false > -Denable_png=true -Denable_tiff=false -Dx11=false > -Dinstalled_tests=false... > The Meson build system > Version: 0.49.2 > Source dir: > /workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/gdk-pixbuf-2.38.0 > Build dir: > /workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/build > Build type: native build > WARNING: Unknown options: "enable_jasper, enable_jpeg, enable_png, > enable_tiff > ... FWIW, I sent a patch to fix this particular warning just above. However, my issue persists. The problem is definitly gdk-pixbuf related, but reverting the two patches from this patchset did not resolve the issue. -- Stefan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On 23.02.2019 13:29, Richard Purdie wrote: > On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote: >> Drop autotools-specific patches. >> >> Rework jku's thumbnailer patch into meson configuration. >> >> Signed-off-by: Alexander Kanavin > > We've seen it before but its happened again: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326 > > I went into the failed build directory and ran "bitbake core-image-sato > -c testsdkext" and it succeeded so I'm not sure sure how we're going to > debug this one... I am not sure if it is related, but we see psplash failing with a custom png recently. failed to load ".../splashscreen-blue.png": Couldn’t recognize the image file format for file “.../splashscreen-blue.png” The psplash calls gdk-pixbuf-csource (through make-image-header.sh). We only saw it failing when building in a Ubuntu 18.04 container, but then reproducible. I also noticed this (probably unrelated) in do_configure log: DEBUG: Executing shell function do_configure gtkdocize: neither configure.ac nor configure.in exist NOTE: Executing meson -Denable_jpeg=true -Denable_jasper=false -Denable_png=true -Denable_tiff=false -Dx11=false -Dinstalled_tests=false... The Meson build system Version: 0.49.2 Source dir: /workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/gdk-pixbuf-2.38.0 Build dir: /workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/build Build type: native build WARNING: Unknown options: "enable_jasper, enable_jpeg, enable_png, enable_tiff ... -- Stefan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 2019-02-23 at 14:43 +0100, Alexander Kanavin wrote: > On Sat, 23 Feb 2019 at 14:36, Richard Purdie > > I think the problem is in staging_populate_sysroot_dir(). It's > > confusing target and native package_archs since in the case we see > > this > > its x86_64 where the target and build archs match. > > > > Not entirely sure how we'll fix this but that is where I think the > > problem is. > > > > Not sure why we're suddenly seeing it now and whether the patches > > somehow trigger it or not... > > The reproducer does fail on master too, so the patches may only have > shifted the timings such that the race outcome is sometimes the > failing one. Agreed, I think we've just exposed a bug. I've sent a patch to fix the problem in the function since its clearly not doing what was intended. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 23 Feb 2019 at 14:36, Richard Purdie
wrote:
> > > I'm at the same time staring at this bit in pixbufcache.bbclass:
> > >
> > > gdkpixbuf_complete() {
> > > GDK_PIXBUF_FATAL_LOADER=1
> > > ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
> > > --update-cache || exit 1
> > > }
> > >
> > > DEPENDS_append_class-native = " gdk-pixbuf-native"
> > > SYSROOT_PREPROCESS_FUNCS_append_class-native = "
> > > pixbufcache_sstate_postinst"
> > >
> > > # See base.bbclass for the other half of this
> > > pixbufcache_sstate_postinst() {
> > > mkdir -p ${SYSROOT_DESTDIR}${bindir}
> > > dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
> > > echo '#!/bin/sh' > $dest
> > > echo "${gdkpixbuf_complete}" >> $dest
> > > chmod 0755 $dest
> > > }
> > >
> > > It's all written for -native, yet the script that fails, resides in
> > > tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g.
> > > the
> > > target sysroot which is racing with the native one). Why is it even
> > > there?
> > > I haven't written this code :) and haven't really seen it before,
> > > but
> > > this might be a lead.
> >
> > I'm sure I've worked on the above before, my memory of why we need it
> > is fuzzy. I do now have a reproducer though:
> >
> > bitbake gdk-pixbuf gdk-pixbuf-native
> > then
> > bitbake build-sysroots -c build_target_sysroot
> >
> > If you bake build_native_sysroot first, the problem goes away.
>
> I think the problem is in staging_populate_sysroot_dir(). It's
> confusing target and native package_archs since in the case we see this
> its x86_64 where the target and build archs match.
>
> Not entirely sure how we'll fix this but that is where I think the
> problem is.
>
> Not sure why we're suddenly seeing it now and whether the patches
> somehow trigger it or not...
The reproducer does fail on master too, so the patches may only have
shifted the timings such that the race outcome is sometimes the
failing one.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 2019-02-23 at 13:25 +, Richard Purdie wrote:
> On Sat, 2019-02-23 at 13:51 +0100, Alexander Kanavin wrote:
> > I'm at the same time staring at this bit in pixbufcache.bbclass:
> >
> > gdkpixbuf_complete() {
> > GDK_PIXBUF_FATAL_LOADER=1
> > ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
> > --update-cache || exit 1
> > }
> >
> > DEPENDS_append_class-native = " gdk-pixbuf-native"
> > SYSROOT_PREPROCESS_FUNCS_append_class-native = "
> > pixbufcache_sstate_postinst"
> >
> > # See base.bbclass for the other half of this
> > pixbufcache_sstate_postinst() {
> > mkdir -p ${SYSROOT_DESTDIR}${bindir}
> > dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
> > echo '#!/bin/sh' > $dest
> > echo "${gdkpixbuf_complete}" >> $dest
> > chmod 0755 $dest
> > }
> >
> > It's all written for -native, yet the script that fails, resides in
> > tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g.
> > the
> > target sysroot which is racing with the native one). Why is it even
> > there?
> > I haven't written this code :) and haven't really seen it before,
> > but
> > this might be a lead.
>
> I'm sure I've worked on the above before, my memory of why we need it
> is fuzzy. I do now have a reproducer though:
>
> bitbake gdk-pixbuf gdk-pixbuf-native
> then
> bitbake build-sysroots -c build_target_sysroot
>
> If you bake build_native_sysroot first, the problem goes away.
I think the problem is in staging_populate_sysroot_dir(). It's
confusing target and native package_archs since in the case we see this
its x86_64 where the target and build archs match.
Not entirely sure how we'll fix this but that is where I think the
problem is.
Not sure why we're suddenly seeing it now and whether the patches
somehow trigger it or not...
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 2019-02-23 at 13:51 +0100, Alexander Kanavin wrote:
> On Sat, 23 Feb 2019 at 13:43, Richard Purdie
> wrote:
> > On Sat, 2019-02-23 at 12:29 +, Richard Purdie wrote:
> > > On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote:
> > > > Drop autotools-specific patches.
> > > >
> > > > Rework jku's thumbnailer patch into meson configuration.
> > > >
> > > > Signed-off-by: Alexander Kanavin
> > >
> > > We've seen it before but its happened again:
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326
> > >
> > > I went into the failed build directory and ran "bitbake core-
> > > image-
> > > sato -c testsdkext" and it succeeded so I'm not sure sure how
> > > we're
> > > going to debug this one...
> >
> > From staring at the log, I think do_build_target_sysroot in build-
> > sysroots.bb may need to depend on do_build_native_sysroot.
> >
> > They're both running at the same time and potentially racing?
>
> I'm at the same time staring at this bit in pixbufcache.bbclass:
>
> gdkpixbuf_complete() {
> GDK_PIXBUF_FATAL_LOADER=1
> ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
> --update-cache || exit 1
> }
>
> DEPENDS_append_class-native = " gdk-pixbuf-native"
> SYSROOT_PREPROCESS_FUNCS_append_class-native = "
> pixbufcache_sstate_postinst"
>
> # See base.bbclass for the other half of this
> pixbufcache_sstate_postinst() {
> mkdir -p ${SYSROOT_DESTDIR}${bindir}
> dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
> echo '#!/bin/sh' > $dest
> echo "${gdkpixbuf_complete}" >> $dest
> chmod 0755 $dest
> }
>
> It's all written for -native, yet the script that fails, resides in
> tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the
> target sysroot which is racing with the native one). Why is it even
> there?
> I haven't written this code :) and haven't really seen it before, but
> this might be a lead.
I'm sure I've worked on the above before, my memory of why we need it
is fuzzy. I do now have a reproducer though:
bitbake gdk-pixbuf gdk-pixbuf-native
then
bitbake build-sysroots -c build_target_sysroot
If you bake build_native_sysroot first, the problem goes away.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 23 Feb 2019 at 13:43, Richard Purdie
wrote:
>
> On Sat, 2019-02-23 at 12:29 +, Richard Purdie wrote:
> > On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote:
> > > Drop autotools-specific patches.
> > >
> > > Rework jku's thumbnailer patch into meson configuration.
> > >
> > > Signed-off-by: Alexander Kanavin
> >
> > We've seen it before but its happened again:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326
> >
> > I went into the failed build directory and ran "bitbake core-image-
> > sato -c testsdkext" and it succeeded so I'm not sure sure how we're
> > going to debug this one...
>
> From staring at the log, I think do_build_target_sysroot in build-
> sysroots.bb may need to depend on do_build_native_sysroot.
>
> They're both running at the same time and potentially racing?
I'm at the same time staring at this bit in pixbufcache.bbclass:
gdkpixbuf_complete() {
GDK_PIXBUF_FATAL_LOADER=1
${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
--update-cache || exit 1
}
DEPENDS_append_class-native = " gdk-pixbuf-native"
SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"
# See base.bbclass for the other half of this
pixbufcache_sstate_postinst() {
mkdir -p ${SYSROOT_DESTDIR}${bindir}
dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
echo '#!/bin/sh' > $dest
echo "${gdkpixbuf_complete}" >> $dest
chmod 0755 $dest
}
It's all written for -native, yet the script that fails, resides in
tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the
target sysroot which is racing with the native one). Why is it even
there?
I haven't written this code :) and haven't really seen it before, but
this might be a lead.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 2019-02-23 at 12:29 +, Richard Purdie wrote: > On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote: > > Drop autotools-specific patches. > > > > Rework jku's thumbnailer patch into meson configuration. > > > > Signed-off-by: Alexander Kanavin > > We've seen it before but its happened again: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326 > > I went into the failed build directory and ran "bitbake core-image- > sato -c testsdkext" and it succeeded so I'm not sure sure how we're > going to debug this one... >From staring at the log, I think do_build_target_sysroot in build- sysroots.bb may need to depend on do_build_native_sysroot. They're both running at the same time and potentially racing? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Sat, 23 Feb 2019 at 13:29, Richard Purdie wrote: > > Drop autotools-specific patches. > > > > Rework jku's thumbnailer patch into meson configuration. > > > > Signed-off-by: Alexander Kanavin > > We've seen it before but its happened again: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326 > > I went into the failed build directory and ran "bitbake core-image-sato > -c testsdkext" and it succeeded so I'm not sure sure how we're going to > debug this one... :-( We can debug by making a tarball snapshot of the failed build dir, and statically inspecting it, I guess. It has to be some kind of race during SDK extraction. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Wed, 2019-02-20 at 21:10 +0100, Alexander Kanavin wrote: > Drop autotools-specific patches. > > Rework jku's thumbnailer patch into meson configuration. > > Signed-off-by: Alexander Kanavin We've seen it before but its happened again: https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326 I went into the failed build directory and ran "bitbake core-image-sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Fri, 22 Feb 2019 at 11:18, Burton, Ross wrote:
>
> On Wed, 20 Feb 2019 at 20:11, Alexander Kanavin
> wrote:
> > -PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
> > +PACKAGECONFIG[x11] = ",,virtual/libx11"
>
> https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/204082e6a7a404ec7372d78ef7a7890ada595154
> is in 2.36.12.
>
> > + # Do not install ptests if ptest is not enabled; gdk-pixbuf has no
> > configuration option for this
> > + if [ "${PTEST_ENABLED}" != "1" ]; then
> > + rm -rf ${D}${datadir}/installed-tests
> > + fi
>
> https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/4c76635e1f19c6d1919d4ea94f6b00f97b996665
> is in 2.38.0.
>
> Last minute upgrade or cherry-pick those?
I've done the upgrade, will send it as a separate patch. It wasn't trivial:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=akanavin/package-version-updates=447725a8d54dc21643c04d798a47fc45d54b5afb
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
On Wed, 20 Feb 2019 at 20:11, Alexander Kanavin wrote:
> -PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
> +PACKAGECONFIG[x11] = ",,virtual/libx11"
https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/204082e6a7a404ec7372d78ef7a7890ada595154
is in 2.36.12.
> + # Do not install ptests if ptest is not enabled; gdk-pixbuf has no
> configuration option for this
> + if [ "${PTEST_ENABLED}" != "1" ]; then
> + rm -rf ${D}${datadir}/installed-tests
> + fi
https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/4c76635e1f19c6d1919d4ea94f6b00f97b996665
is in 2.38.0.
Last minute upgrade or cherry-pick those?
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
Signed-off-by: Alexander Kanavin
---
.../0001-Disable-tests-in-native-builds.patch | 31 +
...f-decisions-around-cross-compilation.patch | 38 +
...without-libtiff-not-having-an-effect.patch | 27
...nd-thumbnailer-cross-compile-failure.patch | 53 +++
...-depend-on-loaders-being-fully-build.patch | 51 +++
...nd-thumbnailer-cross-compile-failure.patch | 131 ++
.../extending-libinstall-dependencies.patch | 42 --
.../gdk-pixbuf/hardcoded_libtool.patch| 33 -
.../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 47 +--
9 files changed, 306 insertions(+), 147 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
new file mode 100644
index 000..1e45b716b93
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
@@ -0,0 +1,31 @@
+From b287cb313dbfac3257f1ab451b19ba59580f78e1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 18 Feb 2019 16:00:12 +0100
+Subject: [PATCH] Disable tests in native builds.
+
+They have found to be problematic at least on Centos 7:
+https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b
+
+With autotools this was not a problem because it had a configuration
+switch for disabling test, which was used. Meson has no such facility :(
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 92c4049..0871c84 100644
+--- a/meson.build
b/meson.build
+@@ -397,7 +397,7 @@ endif
+ # i18n
+ subdir('po')
+
+-subdir('tests')
++#subdir('tests')
+ subdir('thumbnailer')
+
+ # Documentation
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
new file mode 100644
index 000..90d4830df50
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
@@ -0,0 +1,38 @@
+From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Thu, 14 Feb 2019 18:06:25 +0100
+Subject: [PATCH] Fix a couple of decisions around cross-compilation
+
+1. gobject-introspection can be build when cross compiling
+2. generating loaders.cache requires running a target binary which
+we do elsewhere (in postinsts)
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ gdk-pixbuf/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 77c162b..fc3eb33 100644
+--- a/gdk-pixbuf/meson.build
b/gdk-pixbuf/meson.build
+@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin
+ set_variable(bin_name.underscorify(), bin)
+ endforeach
+
++if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache',
+ ],
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
++endif
+
+-build_gir = get_option('with_gir') and not meson.is_cross_build()
++build_gir = get_option('with_gir')
+ if build_gir
+ gir_args = [
+ '--quiet',
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
deleted file mode 100644
index 2a54d8ed763..000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 460befc992adb32434b0408b453be39a6866ccf8 Mon
[OE-core] [PATCH 3/4] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
Add a patch to disable tests in native builds.
Signed-off-by: Alexander Kanavin
---
.../0001-Disable-tests-in-native-builds.patch | 30
...f-decisions-around-cross-compilation.patch | 38 +
...without-libtiff-not-having-an-effect.patch | 27
...nd-thumbnailer-cross-compile-failure.patch | 53 +++
...nd-thumbnailer-cross-compile-failure.patch | 131 ++
.../extending-libinstall-dependencies.patch | 42 --
.../gdk-pixbuf/hardcoded_libtool.patch| 33 -
.../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 41 --
8 files changed, 248 insertions(+), 147 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
new file mode 100644
index 000..c991635bb95
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
@@ -0,0 +1,30 @@
+From d44aad1858c9c0da74f389d3de4dabade28b56c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 18 Feb 2019 16:00:12 +0100
+Subject: [PATCH] Disable tests in native builds.
+
+They have found to be problematic at least on Centos 7:
+https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b
+
+With autotools this was not a problem because it had a configuration
+switch for disabling test, which was used. Meson has no such facility :(
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 92c4049..0871c84 100644
+--- a/meson.build
b/meson.build
+@@ -397,7 +397,7 @@ endif
+ # i18n
+ subdir('po')
+
+-subdir('tests')
++#subdir('tests')
+ subdir('thumbnailer')
+
+ # Documentation
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
new file mode 100644
index 000..90d4830df50
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
@@ -0,0 +1,38 @@
+From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Thu, 14 Feb 2019 18:06:25 +0100
+Subject: [PATCH] Fix a couple of decisions around cross-compilation
+
+1. gobject-introspection can be build when cross compiling
+2. generating loaders.cache requires running a target binary which
+we do elsewhere (in postinsts)
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ gdk-pixbuf/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 77c162b..fc3eb33 100644
+--- a/gdk-pixbuf/meson.build
b/gdk-pixbuf/meson.build
+@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin
+ set_variable(bin_name.underscorify(), bin)
+ endforeach
+
++if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache',
+ ],
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
++endif
+
+-build_gir = get_option('with_gir') and not meson.is_cross_build()
++build_gir = get_option('with_gir')
+ if build_gir
+ gir_args = [
+ '--quiet',
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
deleted file mode 100644
index 2a54d8ed763..000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Tue, 10 Oct 2017 14:33:18 +0300
-Subject: [PATCH] Fix --without-libtiff not having an
