* [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12
@ 2025-07-18 11:55 Philipp Zabel
2025-07-18 11:55 ` [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12 Philipp Zabel
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Philipp Zabel @ 2025-07-18 11:55 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Mesa 25.2 will require libX11 >= 1.8 for the automatic XInitThreads()
call from the library constructor.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/xorg-lib-X11.make | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index dd7fe5e31472..52584404c48b 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
#
# Paths and names
#
-XORG_LIB_X11_VERSION := 1.6.9
-XORG_LIB_X11_MD5 := 55adbfb6d4370ecac5e70598c4e7eed2
+XORG_LIB_X11_VERSION := 1.8.12
+XORG_LIB_X11_MD5 := 146d770e564812e00f97e0cbdce632b7
XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION)
-XORG_LIB_X11_SUFFIX := tar.bz2
+XORG_LIB_X11_SUFFIX := tar.xz
XORG_LIB_X11_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX))
XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11)
@@ -55,6 +55,7 @@ XORG_LIB_X11_CONF_OPT := \
--$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \
--$(call ptx/endis, PTXCONF_XORG_LIB_X11_XKB)-xkb \
--enable-composecache \
+ --enable-thread-safety-constructor \
--disable-lint-library \
--disable-malloc0returnsnull \
$(XORG_OPTIONS_DOCS) \
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12
2025-07-18 11:55 [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Philipp Zabel
@ 2025-07-18 11:55 ` Philipp Zabel
2025-07-30 14:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-07-25 10:49 ` [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Michael Olbrich
2025-07-28 11:38 ` [ptxdist] [PATCH v2] xorg-lib-x11, libx11-locale: " Philipp Zabel
2 siblings, 1 reply; 5+ messages in thread
From: Philipp Zabel @ 2025-07-18 11:55 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/xorg-lib-Xrender.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index 0dae3e0d2dc7..169d2d225280 100644
--- a/rules/xorg-lib-Xrender.make
+++ b/rules/xorg-lib-Xrender.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRENDER) += xorg-lib-xrender
#
# Paths and names
#
-XORG_LIB_XRENDER_VERSION := 0.9.10
-XORG_LIB_XRENDER_MD5 := 802179a76bded0b658f4e9ec5e1830a4
+XORG_LIB_XRENDER_VERSION := 0.9.12
+XORG_LIB_XRENDER_MD5 := 4c54dce455d96e3bdee90823b0869f89
XORG_LIB_XRENDER := libXrender-$(XORG_LIB_XRENDER_VERSION)
-XORG_LIB_XRENDER_SUFFIX := tar.bz2
+XORG_LIB_XRENDER_SUFFIX := tar.xz
XORG_LIB_XRENDER_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX))
XORG_LIB_XRENDER_SOURCE := $(SRCDIR)/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
XORG_LIB_XRENDER_DIR := $(BUILDDIR)/$(XORG_LIB_XRENDER)
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12
2025-07-18 11:55 [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Philipp Zabel
2025-07-18 11:55 ` [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12 Philipp Zabel
@ 2025-07-25 10:49 ` Michael Olbrich
2025-07-28 11:38 ` [ptxdist] [PATCH v2] xorg-lib-x11, libx11-locale: " Philipp Zabel
2 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2025-07-25 10:49 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
On Fri, Jul 18, 2025 at 01:55:27PM +0200, Philipp Zabel wrote:
> Mesa 25.2 will require libX11 >= 1.8 for the automatic XInitThreads()
> call from the library constructor.
The package libx11-locale shares the version and has a patch that needs to
be migrated.
Michael
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> rules/xorg-lib-X11.make | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
> index dd7fe5e31472..52584404c48b 100644
> --- a/rules/xorg-lib-X11.make
> +++ b/rules/xorg-lib-X11.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
> #
> # Paths and names
> #
> -XORG_LIB_X11_VERSION := 1.6.9
> -XORG_LIB_X11_MD5 := 55adbfb6d4370ecac5e70598c4e7eed2
> +XORG_LIB_X11_VERSION := 1.8.12
> +XORG_LIB_X11_MD5 := 146d770e564812e00f97e0cbdce632b7
> XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION)
> -XORG_LIB_X11_SUFFIX := tar.bz2
> +XORG_LIB_X11_SUFFIX := tar.xz
> XORG_LIB_X11_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX))
> XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
> XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11)
> @@ -55,6 +55,7 @@ XORG_LIB_X11_CONF_OPT := \
> --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \
> --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XKB)-xkb \
> --enable-composecache \
> + --enable-thread-safety-constructor \
> --disable-lint-library \
> --disable-malloc0returnsnull \
> $(XORG_OPTIONS_DOCS) \
> --
> 2.39.5
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH v2] xorg-lib-x11, libx11-locale: version bump 1.6.9 -> 1.8.12
2025-07-18 11:55 [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Philipp Zabel
2025-07-18 11:55 ` [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12 Philipp Zabel
2025-07-25 10:49 ` [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Michael Olbrich
@ 2025-07-28 11:38 ` Philipp Zabel
2 siblings, 0 replies; 5+ messages in thread
From: Philipp Zabel @ 2025-07-28 11:38 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Mesa 25.2 will require libX11 >= 1.8 for the automatic XInitThreads()
call from the library constructor.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: Update libx11-locale patch, adapt commit subject.
---
...01-HACK-disable-stuff-not-needed-for-locale-data.patch | 8 ++++----
.../autogen.sh | 0
.../{libx11-locale-1.6.9 => libx11-locale-1.8.12}/series | 0
rules/xorg-lib-X11.make | 7 ++++---
4 files changed, 8 insertions(+), 7 deletions(-)
rename patches/{libx11-locale-1.6.9 => libx11-locale-1.8.12}/0001-HACK-disable-stuff-not-needed-for-locale-data.patch (88%)
rename patches/{libx11-locale-1.6.9 => libx11-locale-1.8.12}/autogen.sh (100%)
rename patches/{libx11-locale-1.6.9 => libx11-locale-1.8.12}/series (100%)
diff --git a/patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch b/patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
similarity index 88%
rename from patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
rename to patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
index dac45134eed8..9f07258193f1 100644
--- a/patches/libx11-locale-1.6.9/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
+++ b/patches/libx11-locale-1.8.12/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 27 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a5fd706f4a3c..65433c677f6d 100644
+index c3f23e25d811..5021b99e718b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -237,30 +237,6 @@ AC_SUBST(XTHREAD_CFLAGS)
+@@ -248,30 +248,6 @@ AC_SUBST(USE_THREAD_LIBS)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
@@ -20,7 +20,7 @@ index a5fd706f4a3c..65433c677f6d 100644
-#
-AC_MSG_CHECKING([keysym definitions])
-AC_ARG_WITH([keysymdefdir],
-- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
+- [AS_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
- [KEYSYMDEFDIR=$withval],
- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
-
@@ -42,7 +42,7 @@ index a5fd706f4a3c..65433c677f6d 100644
AC_ARG_ENABLE(xcms,
AS_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
-@@ -340,9 +316,6 @@ X11_LIBDIR="${libdir}/X11"
+@@ -351,9 +327,6 @@ X11_LIBDIR="${libdir}/X11"
AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
diff --git a/patches/libx11-locale-1.6.9/autogen.sh b/patches/libx11-locale-1.8.12/autogen.sh
similarity index 100%
rename from patches/libx11-locale-1.6.9/autogen.sh
rename to patches/libx11-locale-1.8.12/autogen.sh
diff --git a/patches/libx11-locale-1.6.9/series b/patches/libx11-locale-1.8.12/series
similarity index 100%
rename from patches/libx11-locale-1.6.9/series
rename to patches/libx11-locale-1.8.12/series
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index dd7fe5e31472..52584404c48b 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
#
# Paths and names
#
-XORG_LIB_X11_VERSION := 1.6.9
-XORG_LIB_X11_MD5 := 55adbfb6d4370ecac5e70598c4e7eed2
+XORG_LIB_X11_VERSION := 1.8.12
+XORG_LIB_X11_MD5 := 146d770e564812e00f97e0cbdce632b7
XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION)
-XORG_LIB_X11_SUFFIX := tar.bz2
+XORG_LIB_X11_SUFFIX := tar.xz
XORG_LIB_X11_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX))
XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11)
@@ -55,6 +55,7 @@ XORG_LIB_X11_CONF_OPT := \
--$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \
--$(call ptx/endis, PTXCONF_XORG_LIB_X11_XKB)-xkb \
--enable-composecache \
+ --enable-thread-safety-constructor \
--disable-lint-library \
--disable-malloc0returnsnull \
$(XORG_OPTIONS_DOCS) \
--
2.39.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12
2025-07-18 11:55 ` [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12 Philipp Zabel
@ 2025-07-30 14:00 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2025-07-30 14:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 5b6838d37e2f44abc6995a8f0fb2293c9fbadcf0.
Michael
[sent from post-receive hook]
On Wed, 30 Jul 2025 16:00:23 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20250718115528.3148027-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
> index 0dae3e0d2dc7..169d2d225280 100644
> --- a/rules/xorg-lib-Xrender.make
> +++ b/rules/xorg-lib-Xrender.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRENDER) += xorg-lib-xrender
> #
> # Paths and names
> #
> -XORG_LIB_XRENDER_VERSION := 0.9.10
> -XORG_LIB_XRENDER_MD5 := 802179a76bded0b658f4e9ec5e1830a4
> +XORG_LIB_XRENDER_VERSION := 0.9.12
> +XORG_LIB_XRENDER_MD5 := 4c54dce455d96e3bdee90823b0869f89
> XORG_LIB_XRENDER := libXrender-$(XORG_LIB_XRENDER_VERSION)
> -XORG_LIB_XRENDER_SUFFIX := tar.bz2
> +XORG_LIB_XRENDER_SUFFIX := tar.xz
> XORG_LIB_XRENDER_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX))
> XORG_LIB_XRENDER_SOURCE := $(SRCDIR)/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
> XORG_LIB_XRENDER_DIR := $(BUILDDIR)/$(XORG_LIB_XRENDER)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-30 14:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-18 11:55 [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Philipp Zabel
2025-07-18 11:55 ` [ptxdist] [PATCH 2/2] xorg-lib-xrender: version bump 0.9.10 -> 0.9.12 Philipp Zabel
2025-07-30 14:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-07-25 10:49 ` [ptxdist] [PATCH 1/2] xorg-lib-x11: version bump 1.6.9 -> 1.8.12 Michael Olbrich
2025-07-28 11:38 ` [ptxdist] [PATCH v2] xorg-lib-x11, libx11-locale: " Philipp Zabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox