diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-02-19 20:47:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-21 09:39:01 +0000 |
commit | 8ee7ad352ecaffaf3e35477546c059ee05ebfaa8 (patch) | |
tree | 9d3f8e5b28cc19c0e39ee20fc75cc3fdf8f8d69f /meta/recipes-graphics/wayland/wayland_1.18.0.bb | |
parent | 325bc7438ea6356472734b32337081edd577c98f (diff) | |
download | poky-8ee7ad352ecaffaf3e35477546c059ee05ebfaa8.tar.gz |
wayland: convert to meson build
Replace an autotools-specific .pc adjustment patch with a meson-specific one.
(From OE-Core rev: 88494d118b8ae85b3946df716cfa242a1858f270)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland_1.18.0.bb')
-rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075552..a702b3f6cc 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb | |||
@@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ | |||
13 | DEPENDS = "expat libffi wayland-native" | 13 | DEPENDS = "expat libffi wayland-native" |
14 | 14 | ||
15 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | 15 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ |
16 | file://fixpathinpcfiles.patch \ | 16 | file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ |
17 | file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" | 19 | SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" |
19 | SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" | 20 | SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" |
20 | 21 | ||
21 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 22 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |
22 | 23 | ||
23 | inherit autotools pkgconfig | 24 | inherit meson pkgconfig |
24 | 25 | ||
25 | PACKAGECONFIG ??= "dtd-validation" | 26 | PACKAGECONFIG ??= "dtd-validation" |
26 | PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," | 27 | PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," |
27 | 28 | ||
28 | EXTRA_OECONF = "--disable-documentation --with-host-scanner" | 29 | EXTRA_OEMESON = "-Ddocumentation=false" |
29 | EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" | 30 | EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" |
30 | 31 | ||
31 | # Wayland installs a M4 macro for other projects to use, which uses the target | 32 | # Wayland installs a M4 macro for other projects to use, which uses the target |
32 | # pkg-config to find files. Replace pkg-config with pkg-config-native. | 33 | # pkg-config to find files. Replace pkg-config with pkg-config-native. |