diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch index 4209139da8..acb6c8b140 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch @@ -1,4 +1,4 @@ -From fc28149b6b198042c8d29e0931415adad7ed3231 Mon Sep 17 00:00:00 2001 +From 46687bacbcbb42815fe189c2ff28ba07aae4ee8e Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 16 Mar 2023 08:03:47 +0000 Subject: [PATCH] Fix install conflict when enable multilib. @@ -16,7 +16,7 @@ Signed-off-by: Wang Mingyu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 8b57a83..580f5bc 100644 +index 8b57a83..0312e7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ @@ -27,6 +27,3 @@ index 8b57a83..580f5bc 100644 pkgconfig_DATA = xcb-proto.pc EXTRA_DIST=doc xcb-proto.pc.in autogen.sh README.md --- -2.34.1 - 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 index fe0a96c207..ec0a5c5be6 100644 --- 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 @@ -1,4 +1,4 @@ -From ed499cffabe64fc1dc5898cb69ffa7e62c19e9d8 Mon Sep 17 00:00:00 2001 +From a4cfada0e7cec8627da7d1aba9f786f92c5ac380 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 5 Jul 2022 21:19:20 +0200 Subject: [PATCH] xcb-proto.pc.in: reinstate libdir diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb similarity index 92% rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb index 67c1e8d97d..2a78a87e77 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb @@ -15,7 +15,7 @@ SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \ file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ file://0001-Fix-install-conflict-when-enable-multilib.patch \ " -SRC_URI[sha256sum] = "a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119" +SRC_URI[sha256sum] = "2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c" inherit autotools pkgconfig python3native