xcb-proto: upgrade 1.15 -> 1.15.2

(From OE-Core rev: 1123d6ead7e59c5c181c37a14dba2417afbe55f0)

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
2022-07-06 10:07:19 +02:00
committed by Richard Purdie
parent 6aab3219b3
commit dd24a74e58
2 changed files with 33 additions and 2 deletions

View File

@@ -0,0 +1,29 @@
From ed499cffabe64fc1dc5898cb69ffa7e62c19e9d8 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 5 Jul 2022 21:19:20 +0200
Subject: [PATCH] xcb-proto.pc.in: reinstate libdir
Otherwise the following occurs when building libxcb:
| checking for xcb-proto >= 1.14... no
| configure: error: Package requirements (xcb-proto >= 1.14) were not met:
|
| Variable 'libdir' not defined in '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/libxcb/1.15-r0/recipe-sysroot/usr/share/pkgconfig/xcb-proto.pc'
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/31]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
xcb-proto.pc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in
index 0822b18..c7c8b47 100644
--- a/xcb-proto.pc.in
+++ b/xcb-proto.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
datadir=@datadir@
+libdir=@libdir@
xcbincludedir=${pc_sysrootdir}@xcbincludedir@
PYTHON_PREFIX=@PYTHON_PREFIX@
pythondir=${pc_sysrootdir}@pythondir@

View File

@@ -11,8 +11,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
SRC_URI[sha256sum] = "d34c3b264e8365d16fa9db49179cfa3e9952baaf9275badda0f413966b65955f"
SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \
file://0001-xcb-proto.pc.in-reinstate-libdir.patch \
"
SRC_URI[sha256sum] = "7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed"
inherit autotools pkgconfig python3native