From 2a76693eb823cd79478d69bfa7b8ccad81521917 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 15 Mar 2025 06:46:37 +0000 Subject: [PATCH] xtrans: Upgrade 1.5.2 -> 1.6.0 License-Update: Update copyright years Signed-off-by: Richard Purdie --- .../xorg-lib/xtrans/multilibfix.patch | 16 ++++++++++++---- .../{xtrans_1.5.2.bb => xtrans_1.6.0.bb} | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) rename meta/recipes-graphics/xorg-lib/{xtrans_1.5.2.bb => xtrans_1.6.0.bb} (79%) diff --git a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch index c513bad20e6..21872fe8fe3 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch +++ b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch @@ -1,14 +1,22 @@ +From 721886265be1fa505f55a7797e089d426459339c Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 29 Jun 2018 08:02:16 +0000 +Subject: [PATCH] xtrans: Fix multilib .pc file conflict + The xtrans.pc file is installed into a non-arch directory yet contains libdir which can vary depending on which multilib is configured. The .pc file does not require libdir so remove this to fix multilib builds. Signed-off-by: Richard Purdie Upstream-Status: Pending +--- + xtrans.pc.in | 1 - + 1 file changed, 1 deletion(-) -Index: xtrans-1.3.5/xtrans.pc.in -=================================================================== ---- xtrans-1.3.5.orig/xtrans.pc.in -+++ xtrans-1.3.5/xtrans.pc.in +diff --git a/xtrans.pc.in b/xtrans.pc.in +index cf3e44f..7752996 100644 +--- a/xtrans.pc.in ++++ b/xtrans.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb similarity index 79% rename from meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb rename to meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb index e391bf8a2b5..75ebd5c6151 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb @@ -10,7 +10,7 @@ except in the X Transport Interface code." require xorg-lib-common.inc LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc875e1c864f4f62b29f7d8651f627fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=d6091702432f176651d4bf09e61bbe2d" SRC_URI += "file://multilibfix.patch" @@ -22,4 +22,4 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "5c5cbfe34764a9131d048f03c31c19e57fb4c682d67713eab6a65541b4dff86c" +SRC_URI[sha256sum] = "faafea166bf2451a173d9d593352940ec6404145c5d1da5c213423ce4d359e92" -- 2.47.3