summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch27
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.21.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.20.0.bb)5
2 files changed, 2 insertions, 30 deletions
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
deleted file mode 100644
index e3e71925b8..0000000000
--- a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 3e7cd56611aeec274e48a4816bc7c21f74f15be0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 17 Feb 2020 21:46:18 +0100
4Subject: [PATCH] Do not hardcode the path to wayland-scanner
5
6This results in host contamination during builds.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11---
12 src/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/meson.build b/src/meson.build
16index 15730a3..61edbc8 100644
17--- a/src/meson.build
18+++ b/src/meson.build
19@@ -52,7 +52,7 @@ if get_option('scanner')
20 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
21 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
22 'bindir=' + join_paths('${prefix}', get_option('bindir')),
23- 'wayland_scanner=${bindir}/wayland-scanner'
24+ 'wayland_scanner=wayland-scanner'
25 ],
26 filebase: 'wayland-scanner'
27 )
diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.21.0.bb
index dd48a29dc4..ce59e601d2 100644
--- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.21.0.bb
@@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
12 12
13DEPENDS = "expat libffi wayland-native" 13DEPENDS = "expat libffi wayland-native"
14 14
15SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 15SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
16 file://run-ptest \ 16 file://run-ptest \
17 file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
18 file://0001-build-Fix-strndup-detection-on-MinGW.patch \ 17 file://0001-build-Fix-strndup-detection-on-MinGW.patch \
19 " 18 "
20SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" 19SRC_URI[sha256sum] = "6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac"
21 20
22UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 21UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
23UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" 22UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"