summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-19 20:47:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-21 09:39:01 +0000
commit8ee7ad352ecaffaf3e35477546c059ee05ebfaa8 (patch)
tree9d3f8e5b28cc19c0e39ee20fc75cc3fdf8f8d69f
parent325bc7438ea6356472734b32337081edd577c98f (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch26
-rw-r--r--meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch27
-rw-r--r--meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch32
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.18.0.bb11
4 files changed, 59 insertions, 37 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
new file mode 100644
index 0000000000..2199548bdf
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
@@ -0,0 +1,26 @@
1From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 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 src/meson.build | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/meson.build b/src/meson.build
15index 294aee0..7e410fa 100644
16--- a/src/meson.build
17+++ b/src/meson.build
18@@ -49,7 +49,7 @@ pkgconfig.generate(
19 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
20 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
21 'bindir=' + join_paths('${prefix}', get_option('bindir')),
22- 'wayland_scanner=${bindir}/wayland-scanner'
23+ 'wayland_scanner=wayland-scanner'
24 ],
25 filebase: 'wayland-scanner'
26 )
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
new file mode 100644
index 0000000000..f98037a850
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
@@ -0,0 +1,27 @@
1From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 16 Feb 2020 16:29:53 +0100
4Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
5
6Otherwise, meson attempts to use the target pkg-config and fails.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 src/meson.build | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-)
13
14diff --git a/src/meson.build b/src/meson.build
15index 3e8c9bf..294aee0 100644
16--- a/src/meson.build
17+++ b/src/meson.build
18@@ -55,8 +55,7 @@ pkgconfig.generate(
19 )
20
21 if meson.is_cross_build()
22- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
23- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
24+ wayland_scanner_for_build = find_program('wayland-scanner')
25 else
26 wayland_scanner_for_build = wayland_scanner
27 endif
diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
deleted file mode 100644
index ad3526d984..0000000000
--- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Fix wayland-client and wayland-scanner pc files
2
3Upstream-Status: Pending
4
5Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
6
7Index: wayland-1.14.0/src/wayland-client.pc.in
8===================================================================
9--- wayland-1.14.0.orig/src/wayland-client.pc.in
10+++ wayland-1.14.0/src/wayland-client.pc.in
11@@ -1,7 +1,7 @@
12 prefix=@prefix@
13 exec_prefix=@exec_prefix@
14 datarootdir=@datarootdir@
15-pkgdatadir=@datadir@/@PACKAGE@
16+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
17 libdir=@libdir@
18 includedir=@includedir@
19
20Index: wayland-1.14.0/src/wayland-scanner.pc.in
21===================================================================
22--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
23+++ wayland-1.14.0/src/wayland-scanner.pc.in
24@@ -2,7 +2,7 @@ prefix=@prefix@
25 exec_prefix=@exec_prefix@
26 datarootdir=@datarootdir@
27 pkgdatadir=@datadir@/@PACKAGE@
28-wayland_scanner=@bindir@/wayland-scanner
29+wayland_scanner=wayland-scanner
30
31 Name: Wayland Scanner
32 Description: Wayland scanner
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 \
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://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 "
18SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" 19SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
19SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" 20SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
20 21
21UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 22UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
22 23
23inherit autotools pkgconfig 24inherit meson pkgconfig
24 25
25PACKAGECONFIG ??= "dtd-validation" 26PACKAGECONFIG ??= "dtd-validation"
26PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," 27PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"
27 28
28EXTRA_OECONF = "--disable-documentation --with-host-scanner" 29EXTRA_OEMESON = "-Ddocumentation=false"
29EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" 30EXTRA_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.