diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-07-06 10:07:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-08 00:09:42 +0100 |
commit | dd24a74e58cd5d4143bf408d5b5217d78cacba92 (patch) | |
tree | 6abab1e04fe48fce0b85cfb14d0e240c327e080f /meta/recipes-graphics | |
parent | 6aab3219b3e0865a5b629b0fc578973b2053353e (diff) | |
download | poky-dd24a74e58cd5d4143bf408d5b5217d78cacba92.tar.gz |
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch | 29 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb (renamed from meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb) | 6 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch new file mode 100644 index 0000000000..fe0a96c207 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From ed499cffabe64fc1dc5898cb69ffa7e62c19e9d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 5 Jul 2022 21:19:20 +0200 | ||
4 | Subject: [PATCH] xcb-proto.pc.in: reinstate libdir | ||
5 | |||
6 | Otherwise the following occurs when building libxcb: | ||
7 | | checking for xcb-proto >= 1.14... no | ||
8 | | configure: error: Package requirements (xcb-proto >= 1.14) were not met: | ||
9 | | | ||
10 | | 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' | ||
11 | |||
12 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/31] | ||
13 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
14 | --- | ||
15 | xcb-proto.pc.in | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in | ||
19 | index 0822b18..c7c8b47 100644 | ||
20 | --- a/xcb-proto.pc.in | ||
21 | +++ b/xcb-proto.pc.in | ||
22 | @@ -2,6 +2,7 @@ prefix=@prefix@ | ||
23 | exec_prefix=@exec_prefix@ | ||
24 | datarootdir=@datarootdir@ | ||
25 | datadir=@datadir@ | ||
26 | +libdir=@libdir@ | ||
27 | xcbincludedir=${pc_sysrootdir}@xcbincludedir@ | ||
28 | PYTHON_PREFIX=@PYTHON_PREFIX@ | ||
29 | pythondir=${pc_sysrootdir}@pythondir@ | ||
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb index 070fb62455..4e4472a9c1 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | |||
@@ -11,8 +11,10 @@ LICENSE = "MIT" | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ |
12 | file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" | 12 | file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" |
13 | 13 | ||
14 | SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz" | 14 | SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \ |
15 | SRC_URI[sha256sum] = "d34c3b264e8365d16fa9db49179cfa3e9952baaf9275badda0f413966b65955f" | 15 | file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ |
16 | " | ||
17 | SRC_URI[sha256sum] = "7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed" | ||
16 | 18 | ||
17 | inherit autotools pkgconfig python3native | 19 | inherit autotools pkgconfig python3native |
18 | 20 | ||