[OE-core] [PATCH] libxcursor: upgrade 1.2.0 -> 1.2.1

[OE-core] [PATCH] libxcursor: upgrade 1.2.0 -> 1.2.1

[Wang Mingyu]

temporarily override SRC_URI which is hard-coded in xorg-lib-common.inc
since new versions of packages use a new compression format - .tar.xz

License-Update: 
file type changed from "ISO-8859 text" to "UTF-8 Unicode text".

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../xorg-lib/{libxcursor_1.2.0.bb => libxcursor_1.2.1.bb}   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxcursor_1.2.0.bb => libxcursor_1.2.1.bb} (68%)

diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.1.bb
similarity index 68%
rename from meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb
rename to meta/recipes-graphics/xorg-lib/libxcursor_1.2.1.bb
index f6794b6882..4fd7e949c4 100644
--- a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.1.bb
@@ -7,9 +7,10 @@ can exist in several sizes and the library automatically picks the best \
 size."
 
 require xorg-lib-common.inc
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dbf3bd0f2348eeccd0f217146ba26250"
 
 DEPENDS += "libxrender libxfixes"
 
@@ -17,7 +18,6 @@ PE = "1"
 
 XORG_PN = "libXcursor"
 
-SRC_URI[md5sum] = "9b9be0e289130fb820aedf67705fc549"
-SRC_URI[sha256sum] = "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782"
+SRC_URI[sha256sum] = "46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1

[OE-core] [PATCH] mkfontscale: upgrade 1.2.1 -> 1.2.2

[Wang Mingyu]

temporarily override SRC_URI which is hard-coded in xorg-app-common.inc
since new versions of packages use a new compression format - .tar.xz

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../xorg-app/{mkfontscale_1.2.1.bb => mkfontscale_1.2.2.bb}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.2.1.bb => mkfontscale_1.2.2.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb
index 2d0c51a423..573b05128e 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb
@@ -15,7 +15,8 @@ RPROVIDES:${PN} += "mkfontdir"
 
 BBCLASSEXTEND = "native"
 
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934"
 
-SRC_URI[md5sum] = "215940de158b1a3d8b3f8b442c606e2f"
-SRC_URI[sha256sum] = "ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7"
+SRC_URI[sha256sum] = "8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4"
-- 
2.25.1

[OE-core] [PATCH] xdpyinfo: upgrade 1.3.2 -> 1.3.3

[Wang Mingyu]

temporarily override SRC_URI which is hard-coded in xorg-app-common.inc
since new versions of packages use a new compression format - .tar.xz

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../xorg-app/{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb}        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
rename to meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb
index 2d10b7acca..fa0fe36451 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb
@@ -8,13 +8,14 @@ predefined values for various parameters used in communicating between \
 clients and the server, and the different types of screens and visuals \
 that are available."
 
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libdmx libxau libxcomposite"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
-SRC_URI[md5sum] = "8809037bd48599af55dad81c508b6b39"
-SRC_URI[sha256sum] = "30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51"
+SRC_URI[sha256sum] = "356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206"
 
 EXTRA_OECONF = "--disable-xkb"
-- 
2.25.1

Re: [OE-core] [PATCH] xdpyinfo: upgrade 1.3.2 -> 1.3.3

[Ross Burton]

On Wed, 20 Apr 2022 at 05:10, wangmy <wangmy@fujitsu.com> wrote:
> temporarily override SRC_URI which is hard-coded in xorg-app-common.inc
> since new versions of packages use a new compression format - .tar.xz

Why would this be temporary?  Do you expect xorg to stop using tar.xz,
or do you expect *every* package to move to .xz?  I don't see either
happening in the short term, so I'd say the solution here would be to
parameterise the compression in xorg-app-common.inc.  For now default
to .gz but in the long run if the majority are .xz that can change.

Ross

Re: [OE-core] [PATCH] xdpyinfo: upgrade 1.3.2 -> 1.3.3

[Richard Purdie]

On Wed, 2022-04-20 at 11:19 +0100, Ross Burton wrote:
> On Wed, 20 Apr 2022 at 05:10, wangmy <wangmy@fujitsu.com> wrote:
> > temporarily override SRC_URI which is hard-coded in xorg-app-common.inc
> > since new versions of packages use a new compression format - .tar.xz
> 
> Why would this be temporary?  Do you expect xorg to stop using tar.xz,
> or do you expect *every* package to move to .xz?  I don't see either
> happening in the short term, so I'd say the solution here would be to
> parameterise the compression in xorg-app-common.inc.  For now default
> to .gz but in the long run if the majority are .xz that can change.

I've sent a patch which makes it a variable recipes can change.

Cheers,

Richard