[ptxdist] [PATCH v2 1/2] xcb-proto: version bump 1.16.0 -> 1.17.0

[ptxdist] [PATCH v2 1/2] xcb-proto: version bump 1.16.0 -> 1.17.0

[Sven Püschel]

The HTTP URL returns a 301 redirect. Therefore directly use the
redirect location as URL.

Also adjust the license to X11, as it contains a no advertising clause.
It doesn't quite match the X11 license, as it misses a trademark
statement. The SPDX Online tool [1] suggests
X11-distribute-modifications-variant, but as the COPYING file doesn't
contain the "distibute with modification" grant, using X11 alone is
the best choice.

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

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/xcb-proto.make | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make
index 54cb67220..e811690dc 100644
--- a/rules/xcb-proto.make
+++ b/rules/xcb-proto.make
@@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto
 #
 # Paths and names
 #
-XCB_PROTO_VERSION	:= 1.16.0
-XCB_PROTO_MD5		:= 92081b0faafd93f8262463c69829a482
+XCB_PROTO_VERSION	:= 1.17.0
+XCB_PROTO_MD5		:= c415553d2ee1a8cea43c3234a079b53f
 XCB_PROTO		:= xcb-proto-$(XCB_PROTO_VERSION)
 XCB_PROTO_SUFFIX	:= tar.xz
-XCB_PROTO_URL		:= http://xorg.freedesktop.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
+XCB_PROTO_URL		:= https://www.x.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
 XCB_PROTO_SOURCE	:= $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
 XCB_PROTO_DIR		:= $(BUILDDIR)/$(XCB_PROTO)
-XCB_PROTO_LICENSE	:= MIT
+XCB_PROTO_LICENSE	:= X11
+XCB_PROTO_LICENSE_FILES := \
+	file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.47.3

[ptxdist] [PATCH v2 2/2] libxcb: version bump 1.16 -> 1.17.0

[Sven Püschel]

The HTTP URL redirects to the HTTPS URL. Therefore adjust the URL to
HTTPS to avoid the redirect.

Also fixing the SPDX license identifier, as the license text includes a
no advertising clause. While the SPDX Online tool [1] matches the
license text to X11-distribute-modifications-variant, it doesn't contain
the distribute with modifications grant. Therefore use the X11 license
which in contrast to MIT contains the advertising clause.
Note that it doesn't match exactly, as it misses the trademark at the
end, which caused the online tool to match the wrong license.

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

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/host-libxcb.make | 1 +
 rules/libxcb.make      | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make
index 42a768bc0..acf3a31bf 100644
--- a/rules/host-libxcb.make
+++ b/rules/host-libxcb.make
@@ -25,6 +25,7 @@ HOST_LIBXCB_CONF_ENV	:= \
 HOST_LIBXCB_CONF_TOOL	:= autoconf
 HOST_LIBXCB_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-static \
 	--disable-selective-werror \
 	--disable-strict-compilation \
diff --git a/rules/libxcb.make b/rules/libxcb.make
index 550db7979..7d6f5fb62 100644
--- a/rules/libxcb.make
+++ b/rules/libxcb.make
@@ -14,14 +14,14 @@ PACKAGES-$(PTXCONF_LIBXCB) += libxcb
 #
 # Paths and names
 #
-LIBXCB_VERSION		:= 1.16
-LIBXCB_MD5		:= c769f93c254263077df62404661b710d
+LIBXCB_VERSION		:= 1.17.0
+LIBXCB_MD5		:= 96565523e9f9b701fcb35d31f1d4086e
 LIBXCB			:= libxcb-$(LIBXCB_VERSION)
 LIBXCB_SUFFIX		:= tar.xz
-LIBXCB_URL		:= http://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX)
+LIBXCB_URL		:= https://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX)
 LIBXCB_SOURCE		:= $(SRCDIR)/$(LIBXCB).$(LIBXCB_SUFFIX)
 LIBXCB_DIR		:= $(BUILDDIR)/$(LIBXCB)
-LIBXCB_LICENSE		:= MIT
+LIBXCB_LICENSE		:= X11
 LIBXCB_LICENSE_FILES	:= \
 	file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7
 
@@ -39,6 +39,7 @@ LIBXCB_CONF_ENV := \
 LIBXCB_CONF_TOOL	:= autoconf
 LIBXCB_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-static \
 	--disable-selective-werror \
 	--disable-strict-compilation \
-- 
2.47.3

Re: [ptxdist] [APPLIED] xcb-proto: version bump 1.16.0 -> 1.17.0

[Michael Olbrich]

Thanks, applied as f6dfa01183b7f7beb8f5b1f924fc3209fe985af2.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:55 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> The HTTP URL returns a 301 redirect. Therefore directly use the
> redirect location as URL.
> 
> Also adjust the license to X11, as it contains a no advertising clause.
> It doesn't quite match the X11 license, as it misses a trademark
> statement. The SPDX Online tool [1] suggests
> X11-distribute-modifications-variant, but as the COPYING file doesn't
> contain the "distibute with modification" grant, using X11 alone is
> the best choice.
> 
> [1] https://tools.spdx.org/app/check_license/
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251022121443.200702-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make
> index 54cb67220f20..e811690dc66c 100644
> --- a/rules/xcb-proto.make
> +++ b/rules/xcb-proto.make
> @@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto
>  #
>  # Paths and names
>  #
> -XCB_PROTO_VERSION	:= 1.16.0
> -XCB_PROTO_MD5		:= 92081b0faafd93f8262463c69829a482
> +XCB_PROTO_VERSION	:= 1.17.0
> +XCB_PROTO_MD5		:= c415553d2ee1a8cea43c3234a079b53f
>  XCB_PROTO		:= xcb-proto-$(XCB_PROTO_VERSION)
>  XCB_PROTO_SUFFIX	:= tar.xz
> -XCB_PROTO_URL		:= http://xorg.freedesktop.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
> +XCB_PROTO_URL		:= https://www.x.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
>  XCB_PROTO_SOURCE	:= $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
>  XCB_PROTO_DIR		:= $(BUILDDIR)/$(XCB_PROTO)
> -XCB_PROTO_LICENSE	:= MIT
> +XCB_PROTO_LICENSE	:= X11
> +XCB_PROTO_LICENSE_FILES := \
> +	file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] libxcb: version bump 1.16 -> 1.17.0

[Michael Olbrich]

Thanks, applied as 98de16e3be46ff314624522777632da6f4ae660d.

Michael

[sent from post-receive hook]

On Thu, 23 Oct 2025 15:13:55 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> The HTTP URL redirects to the HTTPS URL. Therefore adjust the URL to
> HTTPS to avoid the redirect.
> 
> Also fixing the SPDX license identifier, as the license text includes a
> no advertising clause. While the SPDX Online tool [1] matches the
> license text to X11-distribute-modifications-variant, it doesn't contain
> the distribute with modifications grant. Therefore use the X11 license
> which in contrast to MIT contains the advertising clause.
> Note that it doesn't match exactly, as it misses the trademark at the
> end, which caused the online tool to match the wrong license.
> 
> [1] https://tools.spdx.org/app/check_license/
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251022121443.200702-2-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make
> index 42a768bc03c3..acf3a31bf997 100644
> --- a/rules/host-libxcb.make
> +++ b/rules/host-libxcb.make
> @@ -25,6 +25,7 @@ HOST_LIBXCB_CONF_ENV	:= \
>  HOST_LIBXCB_CONF_TOOL	:= autoconf
>  HOST_LIBXCB_CONF_OPT	:= \
>  	$(HOST_AUTOCONF) \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--disable-static \
>  	--disable-selective-werror \
>  	--disable-strict-compilation \
> diff --git a/rules/libxcb.make b/rules/libxcb.make
> index 550db79799ae..7d6f5fb62b1f 100644
> --- a/rules/libxcb.make
> +++ b/rules/libxcb.make
> @@ -14,14 +14,14 @@ PACKAGES-$(PTXCONF_LIBXCB) += libxcb
>  #
>  # Paths and names
>  #
> -LIBXCB_VERSION		:= 1.16
> -LIBXCB_MD5		:= c769f93c254263077df62404661b710d
> +LIBXCB_VERSION		:= 1.17.0
> +LIBXCB_MD5		:= 96565523e9f9b701fcb35d31f1d4086e
>  LIBXCB			:= libxcb-$(LIBXCB_VERSION)
>  LIBXCB_SUFFIX		:= tar.xz
> -LIBXCB_URL		:= http://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX)
> +LIBXCB_URL		:= https://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX)
>  LIBXCB_SOURCE		:= $(SRCDIR)/$(LIBXCB).$(LIBXCB_SUFFIX)
>  LIBXCB_DIR		:= $(BUILDDIR)/$(LIBXCB)
> -LIBXCB_LICENSE		:= MIT
> +LIBXCB_LICENSE		:= X11
>  LIBXCB_LICENSE_FILES	:= \
>  	file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7
>  
> @@ -39,6 +39,7 @@ LIBXCB_CONF_ENV := \
>  LIBXCB_CONF_TOOL	:= autoconf
>  LIBXCB_CONF_OPT		:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--disable-static \
>  	--disable-selective-werror \
>  	--disable-strict-compilation \