[ptxdist] [PATCH] xorg-lib-Xi: version bump 1.7.10 -> 1.8.2

[ptxdist] [PATCH] xorg-lib-Xi: version bump 1.7.10 -> 1.8.2

[Sven Püschel]

The tarball is now compressed with xz instead of bzip2.

Checked the licenses contained in the COPYING file with the
SPDX Online Tool [1]. The X11 license seems to be not quite
correct, as it has a slightly different wording than the
MIT-open-group license.

[1] https://tools.spdx.org/app/check_license/

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/xorg-lib-Xi.make | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make
index 6fdde2c4d..cbe2b50c2 100644
--- a/rules/xorg-lib-Xi.make
+++ b/rules/xorg-lib-Xi.make
@@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_XORG_LIB_XI) += xorg-lib-xi
 #
 # Paths and names
 #
-XORG_LIB_XI_VERSION	:= 1.7.10
-XORG_LIB_XI_MD5		:= 62c4af0839072024b4b1c8cbe84216c7
+XORG_LIB_XI_VERSION	:= 1.8.2
+XORG_LIB_XI_MD5		:= 95a960c1692a83cc551979f7ffe28cf4
 XORG_LIB_XI		:= libXi-$(XORG_LIB_XI_VERSION)
-XORG_LIB_XI_SUFFIX	:= tar.bz2
+XORG_LIB_XI_SUFFIX	:= tar.xz
 XORG_LIB_XI_URL		:= $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX))
 XORG_LIB_XI_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
 XORG_LIB_XI_DIR		:= $(BUILDDIR)/$(XORG_LIB_XI)
-XORG_LIB_XI_LICENSE	:= X11 AND MIT
+XORG_LIB_XI_LICENSE	:= MIT-open-group AND SMLNJ AND MIT
+XORG_LIB_XI_LICENSE_FILES := \
+	file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -34,9 +36,9 @@ XORG_LIB_XI_LICENSE	:= X11 AND MIT
 XORG_LIB_XI_CONF_TOOL	:= autoconf
 XORG_LIB_XI_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-malloc0returnsnull \
 	--disable-docs \
 	--disable-specs \
+	--disable-malloc0returnsnull \
 	$(XORG_OPTIONS_DOCS)
 
 # ----------------------------------------------------------------------------
-- 
2.47.3

Re: [ptxdist] [APPLIED] xorg-lib-Xi: version bump 1.7.10 -> 1.8.2

[Michael Olbrich]

Thanks, applied as e770d8cce53fc14941349da79682f61125549cf6.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:14:01 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> The tarball is now compressed with xz instead of bzip2.
> 
> Checked the licenses contained in the COPYING file with the
> SPDX Online Tool [1]. The X11 license seems to be not quite
> correct, as it has a slightly different wording than the
> MIT-open-group license.
> 
> [1] https://tools.spdx.org/app/check_license/
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251022143853.4029815-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make
> index 6fdde2c4d78c..cbe2b50c2775 100644
> --- a/rules/xorg-lib-Xi.make
> +++ b/rules/xorg-lib-Xi.make
> @@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_XORG_LIB_XI) += xorg-lib-xi
>  #
>  # Paths and names
>  #
> -XORG_LIB_XI_VERSION	:= 1.7.10
> -XORG_LIB_XI_MD5		:= 62c4af0839072024b4b1c8cbe84216c7
> +XORG_LIB_XI_VERSION	:= 1.8.2
> +XORG_LIB_XI_MD5		:= 95a960c1692a83cc551979f7ffe28cf4
>  XORG_LIB_XI		:= libXi-$(XORG_LIB_XI_VERSION)
> -XORG_LIB_XI_SUFFIX	:= tar.bz2
> +XORG_LIB_XI_SUFFIX	:= tar.xz
>  XORG_LIB_XI_URL		:= $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX))
>  XORG_LIB_XI_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
>  XORG_LIB_XI_DIR		:= $(BUILDDIR)/$(XORG_LIB_XI)
> -XORG_LIB_XI_LICENSE	:= X11 AND MIT
> +XORG_LIB_XI_LICENSE	:= MIT-open-group AND SMLNJ AND MIT
> +XORG_LIB_XI_LICENSE_FILES := \
> +	file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -34,9 +36,9 @@ XORG_LIB_XI_LICENSE	:= X11 AND MIT
>  XORG_LIB_XI_CONF_TOOL	:= autoconf
>  XORG_LIB_XI_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--disable-malloc0returnsnull \
>  	--disable-docs \
>  	--disable-specs \
> +	--disable-malloc0returnsnull \
>  	$(XORG_OPTIONS_DOCS)
>  
>  # ----------------------------------------------------------------------------