From d520b89046c91f4e5ad78fb52371b19205d67696 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 15 Mar 2025 06:46:37 +0000 Subject: xtrans: Upgrade 1.5.2 -> 1.6.0 License-Update: Update copyright years (From OE-Core rev: 2a76693eb823cd79478d69bfa7b8ccad81521917) Signed-off-by: Richard Purdie --- .../xorg-lib/xtrans/multilibfix.patch | 16 ++++++++++---- meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb | 25 ---------------------- meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb | 25 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch index c513bad20e..21872fe8fe 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.5.2.bb deleted file mode 100644 index e391bf8a2b..0000000000 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.5.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "XTrans: X Transport library" - -DESCRIPTION = "The X Transport Interface is intended to combine all \ -system and transport specific code into a single place. This API should \ -be used by all libraries, clients and servers of the X Window System. \ -Use of this API should allow the addition of new types of transports and \ -support for new platforms without making any changes to the source \ -except in the X Transport Interface code." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc875e1c864f4f62b29f7d8651f627fa" - -SRC_URI += "file://multilibfix.patch" - -PE = "1" - -DEV_PKG_DEPENDENCY = "" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[sha256sum] = "5c5cbfe34764a9131d048f03c31c19e57fb4c682d67713eab6a65541b4dff86c" diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb new file mode 100644 index 0000000000..75ebd5c615 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.6.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "XTrans: X Transport library" + +DESCRIPTION = "The X Transport Interface is intended to combine all \ +system and transport specific code into a single place. This API should \ +be used by all libraries, clients and servers of the X Window System. \ +Use of this API should allow the addition of new types of transports and \ +support for new platforms without making any changes to the source \ +except in the X Transport Interface code." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d6091702432f176651d4bf09e61bbe2d" + +SRC_URI += "file://multilibfix.patch" + +PE = "1" + +DEV_PKG_DEPENDENCY = "" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[sha256sum] = "faafea166bf2451a173d9d593352940ec6404145c5d1da5c213423ce4d359e92" -- cgit v1.2.3-54-g00ecf