<div dir="ltr">Thanks for looking into it :)<div><br></div><div>Alex</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 20 Feb 2020 at 17:21, Joshua Watt <<a href="mailto:jpewhacker@gmail.com">jpewhacker@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">On Wed, Feb 19, 2020 at 1:49 PM Alexander Kanavin<br>
<<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>> wrote:<br>
><br>
> Replace an autotools-specific .pc adjustment patch with a meson-specific one.<br>
<br>
This can (and did) break meta-mingw in the autobuilder, but I pushed<br>
the fix to master-next of meta-mingw<br>
(<a href="https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef" rel="noreferrer" target="_blank">https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef</a>),<br>
so that can be pulled in to try again<br>
<br>
><br>
> Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> ---<br>
> ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++<br>
> ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++<br>
> .../wayland/wayland/fixpathinpcfiles.patch | 32 -------------------<br>
> .../wayland/<a href="http://wayland_1.18.0.bb" rel="noreferrer" target="_blank">wayland_1.18.0.bb</a> | 11 ++++---<br>
> 4 files changed, 59 insertions(+), 37 deletions(-)<br>
> create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch<br>
> create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch<br>
> delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch<br>
><br>
> diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch<br>
> new file mode 100644<br>
> index 0000000000..2199548bdf<br>
> --- /dev/null<br>
> +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch<br>
> @@ -0,0 +1,26 @@<br>
> +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001<br>
> +From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +Date: Mon, 17 Feb 2020 21:46:18 +0100<br>
> +Subject: [PATCH] Do not hardcode the path to wayland-scanner<br>
> +<br>
> +This results in host contamination during builds.<br>
> +<br>
> +Upstream-Status: Inappropriate [oe-core specific]<br>
> +Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +---<br>
> + src/meson.build | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/src/meson.build b/src/meson.build<br>
> +index 294aee0..7e410fa 100644<br>
> +--- a/src/meson.build<br>
> ++++ b/src/meson.build<br>
> +@@ -49,7 +49,7 @@ pkgconfig.generate(<br>
> + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),<br>
> + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),<br>
> + 'bindir=' + join_paths('${prefix}', get_option('bindir')),<br>
> +- 'wayland_scanner=${bindir}/wayland-scanner'<br>
> ++ 'wayland_scanner=wayland-scanner'<br>
> + ],<br>
> + filebase: 'wayland-scanner'<br>
> + )<br>
> diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch<br>
> new file mode 100644<br>
> index 0000000000..f98037a850<br>
> --- /dev/null<br>
> +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch<br>
> @@ -0,0 +1,27 @@<br>
> +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001<br>
> +From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +Date: Sun, 16 Feb 2020 16:29:53 +0100<br>
> +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH<br>
> +<br>
> +Otherwise, meson attempts to use the target pkg-config and fails.<br>
> +<br>
> +Upstream-Status: Pending<br>
> +Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +---<br>
> + src/meson.build | 3 +--<br>
> + 1 file changed, 1 insertion(+), 2 deletions(-)<br>
> +<br>
> +diff --git a/src/meson.build b/src/meson.build<br>
> +index 3e8c9bf..294aee0 100644<br>
> +--- a/src/meson.build<br>
> ++++ b/src/meson.build<br>
> +@@ -55,8 +55,7 @@ pkgconfig.generate(<br>
> + )<br>
> +<br>
> + if meson.is_cross_build()<br>
> +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')<br>
> +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))<br>
> ++ wayland_scanner_for_build = find_program('wayland-scanner')<br>
> + else<br>
> + wayland_scanner_for_build = wayland_scanner<br>
> + endif<br>
> diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch<br>
> deleted file mode 100644<br>
> index ad3526d984..0000000000<br>
> --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch<br>
> +++ /dev/null<br>
> @@ -1,32 +0,0 @@<br>
> -Fix wayland-client and wayland-scanner pc files<br>
> -<br>
> -Upstream-Status: Pending<br>
> -<br>
> -Signed-off-by: Fabien Lahoudere <<a href="mailto:fabien.lahoudere@collabora.co.uk" target="_blank">fabien.lahoudere@collabora.co.uk</a>><br>
> -<br>
> -Index: wayland-1.14.0/src/<a href="http://wayland-client.pc.in" rel="noreferrer" target="_blank">wayland-client.pc.in</a><br>
> -===================================================================<br>
> ---- wayland-1.14.0.orig/src/<a href="http://wayland-client.pc.in" rel="noreferrer" target="_blank">wayland-client.pc.in</a><br>
> -+++ wayland-1.14.0/src/<a href="http://wayland-client.pc.in" rel="noreferrer" target="_blank">wayland-client.pc.in</a><br>
> -@@ -1,7 +1,7 @@<br>
> - prefix=@prefix@<br>
> - exec_prefix=@exec_prefix@<br>
> - datarootdir=@datarootdir@<br>
> --pkgdatadir=@datadir@/@PACKAGE@<br>
> -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@<br>
> - libdir=@libdir@<br>
> - includedir=@includedir@<br>
> -<br>
> -Index: wayland-1.14.0/src/<a href="http://wayland-scanner.pc.in" rel="noreferrer" target="_blank">wayland-scanner.pc.in</a><br>
> -===================================================================<br>
> ---- wayland-1.14.0.orig/src/<a href="http://wayland-scanner.pc.in" rel="noreferrer" target="_blank">wayland-scanner.pc.in</a><br>
> -+++ wayland-1.14.0/src/<a href="http://wayland-scanner.pc.in" rel="noreferrer" target="_blank">wayland-scanner.pc.in</a><br>
> -@@ -2,7 +2,7 @@ prefix=@prefix@<br>
> - exec_prefix=@exec_prefix@<br>
> - datarootdir=@datarootdir@<br>
> - pkgdatadir=@datadir@/@PACKAGE@<br>
> --wayland_scanner=@bindir@/wayland-scanner<br>
> -+wayland_scanner=wayland-scanner<br>
> -<br>
> - Name: Wayland Scanner<br>
> - Description: Wayland scanner<br>
> diff --git a/meta/recipes-graphics/wayland/<a href="http://wayland_1.18.0.bb" rel="noreferrer" target="_blank">wayland_1.18.0.bb</a> b/meta/recipes-graphics/wayland/<a href="http://wayland_1.18.0.bb" rel="noreferrer" target="_blank">wayland_1.18.0.bb</a><br>
> index 7a3f075552..a702b3f6cc 100644<br>
> --- a/meta/recipes-graphics/wayland/<a href="http://wayland_1.18.0.bb" rel="noreferrer" target="_blank">wayland_1.18.0.bb</a><br>
> +++ b/meta/recipes-graphics/wayland/<a href="http://wayland_1.18.0.bb" rel="noreferrer" target="_blank">wayland_1.18.0.bb</a><br>
> @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \<br>
> DEPENDS = "expat libffi wayland-native"<br>
><br>
> SRC_URI = "<a href="https://wayland.freedesktop.org/releases/$%7BBPN%7D-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz</a> \<br>
> - file://fixpathinpcfiles.patch \<br>
> + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \<br>
> + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \<br>
> "<br>
> SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"<br>
> SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"<br>
><br>
> UPSTREAM_CHECK_URI = "<a href="https://wayland.freedesktop.org/releases.html" rel="noreferrer" target="_blank">https://wayland.freedesktop.org/releases.html</a>"<br>
><br>
> -inherit autotools pkgconfig<br>
> +inherit meson pkgconfig<br>
><br>
> PACKAGECONFIG ??= "dtd-validation"<br>
> -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,,"<br>
> +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"<br>
><br>
> -EXTRA_OECONF = "--disable-documentation --with-host-scanner"<br>
> -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"<br>
> +EXTRA_OEMESON = "-Ddocumentation=false"<br>
> +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false"<br>
><br>
> # Wayland installs a M4 macro for other projects to use, which uses the target<br>
> # pkg-config to find files. Replace pkg-config with pkg-config-native.<br>
> --<br>
> 2.25.0<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>