From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH v2] xorg-lib-x11, libx11-locale: version bump 1.6.9 -> 1.8.12
Date: Mon, 28 Jul 2025 13:38:55 +0200 [thread overview]
Message-ID: <20250728113855.732324-1-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20250718115528.3148027-1-p.zabel@pengutronix.de>
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
prev parent reply other threads:[~2025-07-28 11:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 11:55 [ptxdist] [PATCH 1/2] xorg-lib-x11: " 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 ` Philipp Zabel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250728113855.732324-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox