diff options
author | Upgrade Helper <auh@yoctoproject.org> | 2023-05-02 15:33:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-03 11:50:09 +0100 |
commit | 0166381cc701ffca4b7fbd6aee88bdcbe191ff18 (patch) | |
tree | fb79bbf6bff309ad5de2d3dadc857cb955de0a65 | |
parent | 801538a3495cfc8d7d3264e470336ee5df5f1048 (diff) | |
download | poky-0166381cc701ffca4b7fbd6aee88bdcbe191ff18.tar.gz |
waffle: upgrade 1.7.0 -> 1.7.2
Upstream now only generates CMake files on Windows, so remove all
references to CMake.
A zsh completion is now installed, remove this for now as we don't really
use zsh.
(From OE-Core rev: 94cf6ef11bba381ab6f65b03ed1ed14022438151)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | 23 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.7.2.bb (renamed from meta/recipes-graphics/waffle/waffle_1.7.0.bb) | 8 |
3 files changed, 13 insertions, 27 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 index 1b62db92e9..4b3a0e7c4a 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001 | 1 | From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 | 3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 |
4 | Subject: [PATCH] meson.build: request native wayland-scanner | 4 | Subject: [PATCH] meson.build: request native wayland-scanner |
@@ -8,15 +8,16 @@ try to use a cross-binary, and fail. | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
11 | --- | 12 | --- |
12 | meson.build | 2 +- | 13 | meson.build | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
16 | index 0bb6128..0b6da1f 100644 | 17 | index ca6a212..3177bde 100644 |
17 | --- a/meson.build | 18 | --- a/meson.build |
18 | +++ b/meson.build | 19 | +++ b/meson.build |
19 | @@ -108,7 +108,7 @@ else | 20 | @@ -110,7 +110,7 @@ else |
20 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | 21 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), |
21 | ) | 22 | ) |
22 | dep_wayland_scanner = dependency( | 23 | dep_wayland_scanner = dependency( |
@@ -24,4 +25,4 @@ index 0bb6128..0b6da1f 100644 | |||
24 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, | 25 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, |
25 | ) | 26 | ) |
26 | if dep_wayland_scanner.found() | 27 | if dep_wayland_scanner.found() |
27 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner')) | 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 24b2de5d9c..60e6318f7a 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 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001 | 1 | From 71f9399d6cea1e2e885a98b98d82eb628832a86e 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,28 +9,13 @@ 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 | |||
12 | --- | 13 | --- |
13 | meson.build | 4 ---- | ||
14 | src/waffle/meson.build | 7 ------- | 14 | src/waffle/meson.build | 7 ------- |
15 | 2 files changed, 11 deletions(-) | 15 | 1 file changed, 7 deletions(-) |
16 | 16 | ||
17 | diff --git a/meson.build b/meson.build | ||
18 | index ffc02ff..0bb6128 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -104,10 +104,6 @@ else | ||
22 | dep_wayland_client = dependency( | ||
23 | 'wayland-client', version : '>= 1.10', required : get_option('wayland'), | ||
24 | ) | ||
25 | - if dep_wayland_client.found() | ||
26 | - wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'), | ||
27 | - 'wayland.xml') | ||
28 | - endif | ||
29 | dep_wayland_egl = dependency( | ||
30 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | ||
31 | ) | ||
32 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build | 17 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build |
33 | index 01898c8..6245868 100644 | 18 | index e2636c7..3ff5762 100644 |
34 | --- a/src/waffle/meson.build | 19 | --- a/src/waffle/meson.build |
35 | +++ b/src/waffle/meson.build | 20 | +++ b/src/waffle/meson.build |
36 | @@ -88,12 +88,6 @@ if build_surfaceless | 21 | @@ -88,12 +88,6 @@ if build_surfaceless |
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.2.bb index dc475908d0..cb917d8894 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.2.bb | |||
@@ -9,16 +9,16 @@ 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=master \ | 12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \ |
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 \ | 14 | file://0001-meson.build-request-native-wayland-scanner.patch \ |
15 | " | 15 | " |
16 | SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300" | 16 | SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9" |
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | inherit meson features_check lib_package bash-completion pkgconfig | 19 | inherit meson features_check lib_package bash-completion pkgconfig |
20 | 20 | ||
21 | DEPENDS:append = " python3 cmake-native" | 21 | DEPENDS:append = " python3" |
22 | 22 | ||
23 | # This should be overridden per-machine to reflect the capabilities of the GL | 23 | # This should be overridden per-machine to reflect the capabilities of the GL |
24 | # stack. | 24 | # stack. |
@@ -47,5 +47,5 @@ PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=di | |||
47 | # TODO: optionally build manpages and examples | 47 | # TODO: optionally build manpages and examples |
48 | 48 | ||
49 | do_install:append() { | 49 | do_install:append() { |
50 | sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake | 50 | rm -rf ${D}${datadir}/zsh |
51 | } | 51 | } |