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

wayland: consider pkgconfig sysroot for pkgdatadir

Browse Source 
Fix pkgconfig find calls to find wayland protocol XML files.
See discussion in:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/102

(From OE-Core rev: 428ffec520ff25b2a29d506d7af9e6ba8a150d8f)

Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Cord-Landwehr
2023-10-01 12:28:18 +02:00
committed by Richard Purdie
parent f7cbd05853
commit 4c0ce132a5
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch Normal file
View File

@@ -0,0 +1,46 @@
From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sun, 6 Feb 2022 17:23:46 +0100
Subject: [PATCH] Consider pkgconfig sysroot for pkgdatadir
For libs/cflags this is done automatically, but not for manually accessed
variables. This matches what wayland-protocols does.
Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/272]
---
src/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index a8a1d2b..721e151 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -65,7 +65,7 @@ if get_option('scanner')
version: meson.project_version(),
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'wayland_scanner=${bindir}/wayland-scanner'
],
@@ -211,7 +211,7 @@ if get_option('libraries')
filebase: 'wayland-server',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
]
)
@@ -250,7 +250,7 @@ if get_option('libraries')
filebase: 'wayland-client',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
]
)
--
2.37.2

1
meta/recipes-graphics/wayland/wayland_1.22.0.bb
View File

@@ -15,6 +15,7 @@ DEPENDS = "expat libffi wayland-native"
SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://0001-build-Fix-strndup-detection-on-MinGW.patch \
file://0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch \
"
SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842"