diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-12-04 08:13:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-06 11:09:52 +0000 |
| commit | 39ac9a30830f3dc3ba32d47adffd541314d51f3b (patch) | |
| tree | 0fd1d036cfcfa4785d758e6c73293217fd649ed2 | |
| parent | 5583d450d0666c41d561e7a68ffaa381130ac92b (diff) | |
| download | poky-39ac9a30830f3dc3ba32d47adffd541314d51f3b.tar.gz | |
wayland: drop unnecessary patch
wayland now picks the correct setting from the native .pc file.
(From OE-Core rev: 5438c4121c040c4153377d0ec285381a6e93fded)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.19.0.bb | 1 |
2 files changed, 0 insertions, 29 deletions
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 deleted file mode 100644 index 11dc069147..0000000000 --- a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 98e7902a4ddcd80b61cce6f35f97907e841a5eda Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Sun, 16 Feb 2020 16:29:53 +0100 | ||
| 4 | Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH | ||
| 5 | |||
| 6 | Otherwise, meson attempts to use the target pkg-config and fails. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 10 | |||
| 11 | --- | ||
| 12 | src/meson.build | 3 +-- | ||
| 13 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/src/meson.build b/src/meson.build | ||
| 16 | index d91c503..15730a3 100644 | ||
| 17 | --- a/src/meson.build | ||
| 18 | +++ b/src/meson.build | ||
| 19 | @@ -59,8 +59,7 @@ if get_option('scanner') | ||
| 20 | endif | ||
| 21 | |||
| 22 | if meson.is_cross_build() or not get_option('scanner') | ||
| 23 | - scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version()) | ||
| 24 | - wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) | ||
| 25 | + wayland_scanner_for_build = find_program('wayland-scanner') | ||
| 26 | else | ||
| 27 | wayland_scanner_for_build = wayland_scanner | ||
| 28 | endif | ||
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb b/meta/recipes-graphics/wayland/wayland_1.19.0.bb index 5f8b972f76..4c9ae0f75c 100644 --- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb | |||
| @@ -14,7 +14,6 @@ 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://run-ptest \ | 16 | file://run-ptest \ |
| 17 | file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ | ||
| 18 | file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ | 17 | file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ |
| 19 | file://0001-build-Fix-strndup-detection-on-MinGW.patch \ | 18 | file://0001-build-Fix-strndup-detection-on-MinGW.patch \ |
| 20 | " | 19 | " |
