[25/27] xcb-proto: upgrade 1.15 -> 1.15.2

Message ID	20220706080721.3072553-25-alex@linutronix.de
State	Accepted, archived
Commit	1123d6ead7e59c5c181c37a14dba2417afbe55f0
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.208.45, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 25/27] xcb-proto: upgrade 1.15 -> 1.15.2 Date: Wed, 6 Jul 2022 10:07:19 +0200 Message-Id: <20220706080721.3072553-25-alex@linutronix.de> In-Reply-To: <20220706080721.3072553-1-alex@linutronix.de> References: <20220706080721.3072553-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/27] openssl: update 3.0.4 -> 3.0.5 \| expand [01/27] openssl: update 3.0.4 -> 3.0.5 [02/27] diffoscope: upgrade 216 -> 217 [03/27] glib-2.0: upgrade 2.72.2 -> 2.72.3 [04/27] glib-networking: upgrade 2.72.0 -> 2.72.1 [05/27] gstreamer1.0: upgrade 1.20.2 -> 1.20.3 [06/27] harfbuzz: upgrade 4.3.0 -> 4.4.1 [07/27] kmod: upgrade 29 -> 30 [08/27] libsoup: upgrade 3.0.6 -> 3.0.7 [09/27] mesa: upgrade 22.1.2 -> 22.1.3 [10/27] mpg123: upgrade 1.29.3 -> 1.30.0 [11/27] nghttp2: upgrade 1.47.0 -> 1.48.0 [12/27] piglit: upgrade to latest revision [13/27] pulseaudio: upgrade 16.0 -> 16.1 [14/27] python3-cffi: upgrade 1.15.0 -> 1.15.1 [15/27] python3-cryptography: upgrade 37.0.2 -> 37.0.3 [16/27] python3-cryptography-vectors: upgrade 37.0.2 -> 37.0.3 [17/27] python3-hatchling: upgrade 1.3.0 -> 1.3.1 [18/27] python3-hypothesis: upgrade 6.46.11 -> 6.48.2 [19/27] python3-jsonschema: upgrade 4.6.0 -> 4.6.1 [20/27] python3-mako: upgrade 1.2.0 -> 1.2.1 [21/27] python3-pycryptodomex: upgrade 3.14.1 -> 3.15.0 [22/27] python3-requests: upgrade 2.28.0 -> 2.28.1 [23/27] python3-setuptools: upgrade 62.5.0 -> 62.6.0 [24/27] python3-sphinx: upgrade 5.0.0 -> 5.0.2 [25/27] xcb-proto: upgrade 1.15 -> 1.15.2 [26/27] procps: restrict version check to 3.x [27/27] ncurses: mark upstream version as unknown

Message ID

20220706080721.3072553-25-alex@linutronix.de

State

Accepted, archived

Commit

1123d6ead7e59c5c181c37a14dba2417afbe55f0

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 25/27] xcb-proto: upgrade 1.15 -> 1.15.2
Date: Wed,  6 Jul 2022 10:07:19 +0200
Message-Id: <20220706080721.3072553-25-alex@linutronix.de>
In-Reply-To: <20220706080721.3072553-1-alex@linutronix.de>
References: <20220706080721.3072553-1-alex@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/27] openssl: update 3.0.4 -> 3.0.5 | expand

Commit Message

Alexander Kanavin July 6, 2022, 8:07 a.m. UTC

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...001-xcb-proto.pc.in-reinstate-libdir.patch | 29 +++++++++++++++++++
 ...{xcb-proto_1.15.bb => xcb-proto_1.15.2.bb} |  6 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch
 rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.15.bb => xcb-proto_1.15.2.bb} (84%)

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 @@ 
+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@
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
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb
rename to 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"
 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

[25/27] xcb-proto: upgrade 1.15 -> 1.15.2

Commit Message

Patch