mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-14 08:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

waffle: update 1.6.1 -> 1.7.0

Browse Source 
(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>
This commit is contained in:
Alexander Kanavin
2021-10-27 11:07:28 +02:00
committed by Richard Purdie
parent 145a9c3671
commit aae23182ef
2 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch Normal file
View File

@@ -0,0 +1,56 @@
From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 26 Oct 2021 08:52:17 +0200
Subject: [PATCH] waffle: do not make core protocol into the library
None of the consumers (which is just piglit) use it, and
this avoids host contamination from pkg-config suggesting
wayland.xml from the host.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meson.build | 4 ----
src/waffle/meson.build | 7 -------
2 files changed, 11 deletions(-)
diff --git a/meson.build b/meson.build
index ffc02ff..0bb6128 100644
--- a/meson.build
+++ b/meson.build
@@ -104,10 +104,6 @@ else
dep_wayland_client = dependency(
'wayland-client', version : '>= 1.10', required : get_option('wayland'),
)
- if dep_wayland_client.found()
- wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'),
- 'wayland.xml')
- endif
dep_wayland_egl = dependency(
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
diff --git a/src/waffle/meson.build b/src/waffle/meson.build
index 01898c8..6245868 100644
--- a/src/waffle/meson.build
+++ b/src/waffle/meson.build
@@ -88,12 +88,6 @@ if build_surfaceless
endif
if build_wayland
- wl_core_proto_c = custom_target(
- 'wl-core-proto.c',
- input: wayland_core_xml,
- output: 'wl-core-proto.c',
- command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
- )
wl_xdg_shell_proto_c = custom_target(
'wl-xdg-shell-proto.c',
input: wayland_xdg_shell_xml,
@@ -114,7 +108,6 @@ if build_wayland
'wayland/wayland_wrapper.c',
)
files_libwaffle += [
- wl_core_proto_c,
wl_xdg_shell_proto_c,
wl_xdg_shell_proto_h,
]

14
meta/recipes-graphics/waffle/waffle_1.6.1.bb → meta/recipes-graphics/waffle/waffle_1.7.0.bb
View File

@@ -7,10 +7,12 @@ HOMEPAGE = "https://gitlab.freedesktop.org/mesa/waffle"
BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.6"
SRCREV = "d7e8c4759704b3c571fa3697c716279c26fd05eb"
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https \
file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
"
SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300"
S = "${WORKDIR}/git"
inherit meson features_check lib_package bash-completion pkgconfig
@@ -31,7 +33,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx
# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
# DISTRO_FEATURE.
PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland"
PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native"
# I say virtual/libgl, actually wants gbm.pc egl.pc
PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev"
@@ -41,3 +43,7 @@ PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFI
PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl"
# TODO: optionally build manpages and examples
do_install:append() {
sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake
}