diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-13 18:33:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 08:07:01 +0100 |
commit | cdc15a0ff2a1872cff05c695806235b2e24f1cda (patch) | |
tree | c2da23f16054a321c244c3f4b5e275a5c3f92909 /meta | |
parent | 0a60440cebabf0eb166cda75b330387932116ca0 (diff) | |
download | poky-cdc15a0ff2a1872cff05c695806235b2e24f1cda.tar.gz |
waffle: update 1.7.2 -> 1.8.0
(From OE-Core rev: b63ce3e9ae0e38e9951440d805b0d9487fd3736d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch | 28 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.8.0.bb (renamed from meta/recipes-graphics/waffle/waffle_1.7.2.bb) | 5 |
3 files changed, 6 insertions, 36 deletions
diff --git a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch deleted file mode 100644 index 4b3a0e7c4a..0000000000 --- a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 | ||
4 | Subject: [PATCH] meson.build: request native wayland-scanner | ||
5 | |||
6 | This matters in cross compilation, as otherwise meson will | ||
7 | try to use a cross-binary, and fail. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | --- | ||
13 | meson.build | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index ca6a212..3177bde 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -110,7 +110,7 @@ else | ||
21 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | ||
22 | ) | ||
23 | dep_wayland_scanner = dependency( | ||
24 | - 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), | ||
25 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, | ||
26 | ) | ||
27 | if dep_wayland_scanner.found() | ||
28 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner')) | ||
diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch index 60e6318f7a..31ac3e0dd1 100644 --- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001 | 1 | From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 | 3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 |
4 | Subject: [PATCH] waffle: do not make core protocol into the library | 4 | Subject: [PATCH] waffle: do not make core protocol into the library |
@@ -9,16 +9,15 @@ wayland.xml from the host. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
12 | |||
13 | --- | 12 | --- |
14 | src/waffle/meson.build | 7 ------- | 13 | src/waffle/meson.build | 7 ------- |
15 | 1 file changed, 7 deletions(-) | 14 | 1 file changed, 7 deletions(-) |
16 | 15 | ||
17 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build | 16 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build |
18 | index e2636c7..3ff5762 100644 | 17 | index 1cc99f6..022745a 100644 |
19 | --- a/src/waffle/meson.build | 18 | --- a/src/waffle/meson.build |
20 | +++ b/src/waffle/meson.build | 19 | +++ b/src/waffle/meson.build |
21 | @@ -88,12 +88,6 @@ if build_surfaceless | 20 | @@ -89,12 +89,6 @@ if build_surfaceless |
22 | endif | 21 | endif |
23 | 22 | ||
24 | if build_wayland | 23 | if build_wayland |
@@ -31,7 +30,7 @@ index e2636c7..3ff5762 100644 | |||
31 | wl_xdg_shell_proto_c = custom_target( | 30 | wl_xdg_shell_proto_c = custom_target( |
32 | 'wl-xdg-shell-proto.c', | 31 | 'wl-xdg-shell-proto.c', |
33 | input: wayland_xdg_shell_xml, | 32 | input: wayland_xdg_shell_xml, |
34 | @@ -114,7 +108,6 @@ if build_wayland | 33 | @@ -115,7 +109,6 @@ if build_wayland |
35 | 'wayland/wayland_wrapper.c', | 34 | 'wayland/wayland_wrapper.c', |
36 | ) | 35 | ) |
37 | files_libwaffle += [ | 36 | files_libwaffle += [ |
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.2.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb index cb917d8894..12b31dcff1 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.2.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb | |||
@@ -9,11 +9,10 @@ LICENSE = "BSD-2-Clause" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ |
10 | file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" | 10 | file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" |
11 | 11 | ||
12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \ | 12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ |
13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ | 13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ |
14 | file://0001-meson.build-request-native-wayland-scanner.patch \ | ||
15 | " | 14 | " |
16 | SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9" | 15 | SRCREV = "580b912a30085528886603942c100c7b309b3bdb" |
17 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
18 | 17 | ||
19 | inherit meson features_check lib_package bash-completion pkgconfig | 18 | inherit meson features_check lib_package bash-completion pkgconfig |