mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 23:39:40 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
5583d450d0
commit
39ac9a3083
@@ -1,28 +0,0 @@
|
||||
From 98e7902a4ddcd80b61cce6f35f97907e841a5eda Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sun, 16 Feb 2020 16:29:53 +0100
|
||||
Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
|
||||
|
||||
Otherwise, meson attempts to use the target pkg-config and fails.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
src/meson.build | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index d91c503..15730a3 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -59,8 +59,7 @@ if get_option('scanner')
|
||||
endif
|
||||
|
||||
if meson.is_cross_build() or not get_option('scanner')
|
||||
- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
||||
- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
|
||||
+ wayland_scanner_for_build = find_program('wayland-scanner')
|
||||
else
|
||||
wayland_scanner_for_build = wayland_scanner
|
||||
endif
|
||||
@@ -14,7 +14,6 @@ DEPENDS = "expat libffi wayland-native"
|
||||
|
||||
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://run-ptest \
|
||||
file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
|
||||
file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
|
||||
file://0001-build-Fix-strndup-detection-on-MinGW.patch \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user