From 1bb9a58b32137058ea0d28086544dc0b58347c23 Mon Sep 17 00:00:00 2001 From: Daniel Martin Date: Wed, 22 Jul 2026 22:44:06 +1000 Subject: [PATCH] xwayland to 24.1.13 --- .../xdriver_xf86-video-nv.hash | 6 ++-- .../xdriver_xf86-video-nv.mk | 2 +- .../x11r7/xlib_libXfont2/xlib_libXfont2.hash | 6 ++-- .../x11r7/xlib_libXfont2/xlib_libXfont2.mk | 2 +- .../xserver_xorg-server.hash | 6 ++-- .../xserver_xorg-server.mk | 2 +- ...0001-include-misc.h-fix-uClibc-build.patch | 31 +++++++++++++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++-- package/x11r7/xwayland/xwayland.mk | 4 +-- 9 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 package/x11r7/xwayland/0001-include-misc.h-fix-uClibc-build.patch diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash index 4154efb6124..f51e039c377 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2024-March/003489.html -sha256 c68dbda431f3d47000606f8173b977b811c76ba9dda1a5d2e3ee122bbbb98aca xf86-video-nv-2.1.23.tar.xz -sha512 ce09f37bd29bbe588a8788d643240c9b0324654ea37b8e7f0f127494999f24b3048ca0c7ea91b33ef94efd12b570bfb73c8a5e20bf63749b01cbdc5669136b9e xf86-video-nv-2.1.23.tar.xz +# From https://lists.x.org/archives/xorg-announce/2026-April/003694.html +sha256 2fb667de9d10bfa7ecddbb951f93020a2c0e42757b000a3d6f400bd54845df23 xf86-video-nv-2.1.24.tar.xz +sha512 38e866f44f6233508f40002013e98fbc7f4e090a44b89a7116342aacc4cdc390a54a5a3d34c821150130386e47f2203c678e44861a1631f2e406f98aaa7c42de xf86-video-nv-2.1.24.tar.xz # Locally calculated sha256 10d10e1ec37594d481c3de8dda22a40b731ebd43be7ccd462baaa7394738a9f3 COPYING diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index cec2101d3c1..fb021ae20e1 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.23 +XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.24 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.xz XDRIVER_XF86_VIDEO_NV_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NV_LICENSE = MIT diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 4f50b2dbd27..86e972a0e84 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2024-August/003523.html -sha256 8b7b82fdeba48769b69433e8e3fbb984a5f6bf368b0d5f47abeec49de3e58efb libXfont2-2.0.7.tar.xz -sha512 f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0 libXfont2-2.0.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2026-July/003715.html +sha256 f556c0e1093a4e6911cc90bc4b106d201902ee187fd74af206ff162f7e6a24d5 libXfont2-2.0.8.tar.xz +sha512 e14cc3fa03d7baa4554ee5754ab33f69ac1da3d509c686a5f705fde8cd07772be564d68cc18d9fd0beb5ed7b2f864fcd7f6bf4983f5c0db08a9c747d0e001531 libXfont2-2.0.8.tar.xz # Locally calculated sha256 3b1047f0d45584973866a40e3eedc74aea4c6ac636960d650ae05af603e6d1a8 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index c95f6c6395c..a881a4c55b1 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.7 +XLIB_LIBXFONT2_VERSION = 2.0.8 XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.xz XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index b7adf1559d2..1f664e88e43 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2026-April/003678.html -sha256 1a242c8917c49ba29ccc1f6021613d8a2b9805dd0d271a66ae9d09f4b0bb06b3 xorg-server-21.1.22.tar.xz -sha512 6cb37ff971e10eb4a7dfcb3e8071afd769c7632d50e4ad8bc948b810dc4847e152b8a05ec135f55e0695b35908abd07e7728ef85dd3135456fd532e919f440f4 xorg-server-21.1.22.tar.xz +# From https://lists.x.org/archives/xorg-announce/2026-July/003718.html +sha256 1a4eb36ca65cc3b1b936566d677a9786e13c11cd5806e951ac55f3f5ce3984af xorg-server-21.1.24.tar.xz +sha512 f51372b04fe21632fc778ff240705161ed2dccc0114dbe3ee25156d8ac85ec945e2ac05d8638bc7d8d54bad4dfc89cb26b6bd2058b7804d54ab7179e1ac2eb13 xorg-server-21.1.24.tar.xz # Locally calculated sha256 c9f90a6669109aad6c9a7c3b46cc2c574221a73b792afa419336816b49da5c11 COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 7633db917f4..58098982779 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.22 +XSERVER_XORG_SERVER_VERSION = 21.1.24 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT diff --git a/package/x11r7/xwayland/0001-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xwayland/0001-include-misc.h-fix-uClibc-build.patch new file mode 100644 index 00000000000..562aa79fbb7 --- /dev/null +++ b/package/x11r7/xwayland/0001-include-misc.h-fix-uClibc-build.patch @@ -0,0 +1,31 @@ +From 2e8fca00f5bdb02f2f59aaa428d1e9d808ab0e86 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 16 Jun 2018 19:20:16 +0200 +Subject: [PATCH] include/misc.h: fix uClibc build + +A similar fix was used for Dovecot: +https://www.dovecot.org/list/dovecot/2017-November/110019.html + +Signed-off-by: Bernd Kuhls +--- + include/misc.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/misc.h b/include/misc.h +index 14920c3c3..390e52b60 100644 +--- a/include/misc.h ++++ b/include/misc.h +@@ -185,6 +185,10 @@ typedef struct _xReq *xReqPtr; + #endif + #endif + ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /** + * Calculate the number of bytes needed to hold bits. + * @param bits The minimum number of bits needed. +-- +2.17.1 + diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index ba84d20b9f2..c9b931b6e2c 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2026-April/003679.html -sha256 459762be8ea046c94386687d77a87add6073868bee14f02913eafebb945b7aa0 xwayland-24.1.10.tar.xz -sha512 bceba1db7f4d7ac92d2b2a3c8f6f7ab0cc093f396fe89406f8dba25e32ffc3edfa552df246cbfb3b0708c1d28b3e179694d11870b063d5b8f9ab2db9fb861a8f xwayland-24.1.10.tar.xz +# From https://lists.x.org/archives/xorg-announce/2026-July/003717.html +sha256 173aea3d6f79609164c04528e1c8e4c9b60fcd59391c3c9dad4667297d727fb6 xwayland-24.1.13.tar.xz +sha512 e06e58025b441892fdd17ac55fd5c7e137bffc941b76ad784dc008047c778c6ee2895fcc47b9e8c74b1d8372491e69c39933c4186aec4df55571614f8ba98e3c xwayland-24.1.13.tar.xz # Locally calculated sha256 c9f90a6669109aad6c9a7c3b46cc2c574221a73b792afa419336816b49da5c11 COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 16a6dc777f0..09e30e36527 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 24.1.10 +XWAYLAND_VERSION = 24.1.13 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT @@ -32,7 +32,7 @@ XWAYLAND_CONF_OPTS = \ -Ddtrace=false \ -Ddocs=false -ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy) XWAYLAND_CONF_OPTS += -Dglamor=true XWAYLAND_DEPENDENCIES += libepoxy else