summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-27 11:07:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-28 14:16:31 +0100
commitaae23182ef16274d55ecc2044e477df90e6bb339 (patch)
tree38a84fc93e734982f8ea22fb8f3888108d4ee926 /meta
parent145a9c36713b3d59ecf32f2109adf6a257ca5936 (diff)
downloadpoky-aae23182ef16274d55ecc2044e477df90e6bb339.tar.gz
waffle: update 1.6.1 -> 1.7.0
(From OE-Core rev: 95acd86a4aeb8d2122285dd1745c77622462d33f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch56
-rw-r--r--meta/recipes-graphics/waffle/waffle_1.7.0.bb (renamed from meta/recipes-graphics/waffle/waffle_1.6.1.bb)14
2 files changed, 66 insertions, 4 deletions
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
new file mode 100644
index 0000000000..24b2de5d9c
--- /dev/null
+++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
@@ -0,0 +1,56 @@
1From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 26 Oct 2021 08:52:17 +0200
4Subject: [PATCH] waffle: do not make core protocol into the library
5
6None of the consumers (which is just piglit) use it, and
7this avoids host contamination from pkg-config suggesting
8wayland.xml from the host.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 meson.build | 4 ----
14 src/waffle/meson.build | 7 -------
15 2 files changed, 11 deletions(-)
16
17diff --git a/meson.build b/meson.build
18index 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 )
32diff --git a/src/waffle/meson.build b/src/waffle/meson.build
33index 01898c8..6245868 100644
34--- a/src/waffle/meson.build
35+++ b/src/waffle/meson.build
36@@ -88,12 +88,6 @@ if build_surfaceless
37 endif
38
39 if build_wayland
40- wl_core_proto_c = custom_target(
41- 'wl-core-proto.c',
42- input: wayland_core_xml,
43- output: 'wl-core-proto.c',
44- command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
45- )
46 wl_xdg_shell_proto_c = custom_target(
47 'wl-xdg-shell-proto.c',
48 input: wayland_xdg_shell_xml,
49@@ -114,7 +108,6 @@ if build_wayland
50 'wayland/wayland_wrapper.c',
51 )
52 files_libwaffle += [
53- wl_core_proto_c,
54 wl_xdg_shell_proto_c,
55 wl_xdg_shell_proto_h,
56 ]
diff --git a/meta/recipes-graphics/waffle/waffle_1.6.1.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb
index 161bbb0d26..846cd0d818 100644
--- a/meta/recipes-graphics/waffle/waffle_1.6.1.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb
@@ -7,10 +7,12 @@ HOMEPAGE = "https://gitlab.freedesktop.org/mesa/waffle"
7BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" 7BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle"
8LICENSE = "BSD-2-Clause" 8LICENSE = "BSD-2-Clause"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
10 file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" 10 file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
11 11
12SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.6" 12SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https \
13SRCREV = "d7e8c4759704b3c571fa3697c716279c26fd05eb" 13 file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
14 "
15SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300"
14S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
15 17
16inherit meson features_check lib_package bash-completion pkgconfig 18inherit meson features_check lib_package bash-completion pkgconfig
@@ -31,7 +33,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx
31 33
32# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland 34# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
33# DISTRO_FEATURE. 35# DISTRO_FEATURE.
34PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland" 36PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native"
35 37
36# I say virtual/libgl, actually wants gbm.pc egl.pc 38# I say virtual/libgl, actually wants gbm.pc egl.pc
37PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev" 39PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev"
@@ -41,3 +43,7 @@ PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFI
41PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl" 43PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl"
42 44
43# TODO: optionally build manpages and examples 45# TODO: optionally build manpages and examples
46
47do_install:append() {
48 sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake
49}