Merge pull request #6840 from heitbaum/x11

Wayland and X11 updates

packages/sysutils/libevdev/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libevdev"
-PKG_VERSION="1.12.1"
+PKG_VERSION="1.13.0"
-PKG_SHA256="1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c"
+PKG_SHA256="9edf2006cc86a5055279647c38ec923d11a821ee4dc2c3033e8d20e8ee237cd9"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/"
 PKG_URL="http://www.freedesktop.org/software/libevdev/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/wayland/lib/fcft/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fcft"
-PKG_VERSION="3.1.2"
+PKG_VERSION="3.1.3"
-PKG_SHA256="f571afe693d3fa11fe36e97c7a2ecbbf9313755ee31c1ec3dcc648796b8e6db0"
+PKG_SHA256="d9bff464ae5c31fbaad0fb8a50b6db2fc168c48aae169d005066ad358b9d432d"
 PKG_LICENSE="MIT"
 PKG_SITE="https://codeberg.org/dnkl/fcft"
 PKG_URL="https://codeberg.org/dnkl/fcft/archive/${PKG_VERSION}.tar.gz"

packages/wayland/lib/tllist/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tllist"
-PKG_VERSION="1.0.5"
+PKG_VERSION="1.1.0"
-PKG_SHA256="b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd"
+PKG_SHA256="0e7b7094a02550dd80b7243bcffc3671550b0f1d8ba625e4dff52517827d5d23"
 PKG_LICENSE="MIT"
 PKG_SITE="https://codeberg.org/dnkl/tllist"
 PKG_URL="https://codeberg.org/dnkl/tllist/archive/${PKG_VERSION}.tar.gz"

packages/wayland/util/foot/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="foot"
-PKG_VERSION="1.12.1"
+PKG_VERSION="1.13.1"
-PKG_SHA256="14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd"
+PKG_SHA256="604f777fdaccfc1ee2d20376cc5688a819dcd6b7113725880cc973194fd6c737"
 PKG_LICENSE="MIT"
 PKG_SITE="https://codeberg.org/dnkl/foot/"
 PKG_URL="https://codeberg.org/dnkl/foot/archive/${PKG_VERSION}.tar.gz"

packages/wayland/weston/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="weston"
-PKG_VERSION="10.0.1"
+PKG_VERSION="10.0.2"
-PKG_SHA256="8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115"
+PKG_SHA256="89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7"
 PKG_LICENSE="MIT"
 PKG_SITE="https://wayland.freedesktop.org/"
 PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/x11/data/xkeyboard-config/package.mk

@@ -3,14 +3,13 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.34"
+PKG_VERSION="2.36"
-PKG_SHA256="b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce"
+PKG_SHA256="1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595"
 PKG_LICENSE="MIT"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="X keyboard extension data files."
-PKG_TOOLCHAIN="autotools"
 
 configure_package() {
   if [ "${DISPLAYSERVER}" = "x11" ]; then
@@ -19,17 +18,13 @@ configure_package() {
 }
 
 pre_configure_target() {
-  PKG_CONFIGURE_OPTS_TARGET="--without-xsltproc \
+  PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \
-                             --enable-compat-rules \
+                         -Ddatadir=lib"
-                             --disable-runtime-deps \
-                             --enable-nls \
-                             --disable-rpath \
-                             --datadir=/usr/lib \
-                             --with-gnu-ld"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
-    PKG_CONFIGURE_OPTS_TARGET+=" XKBCOMP=/usr/bin/xkbcomp \
+    PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \
-                               --with-xkb-base=${XORG_PATH_XKB} \
+                            -Dxorg-rules-symlinks=true"
-                               --with-xkb-rules-symlink=xorg"
+  else
+    PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false"
   fi
 }

packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch

@@ -1,39 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2018-01-31 11:06:08.000000000 -0800
-+++ b/configure.ac	2018-12-05 16:32:04.016734637 -0800
-@@ -2,13 +2,6 @@
- AC_CONFIG_SRCDIR(rules/base.xml.in)
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
--m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.12 or later before
--          running autoconf/autogen])])
--XORG_MACROS_VERSION(1.12)
--XORG_MANPAGE_SECTIONS
--XORG_WITH_XSLTPROC
- AC_PROG_SED
- 
- AC_SUBST(VERSION)
-diff -Naur a/man/Makefile.am b/man/Makefile.am
---- a/man/Makefile.am	2018-01-31 11:06:08.000000000 -0800
-+++ b/man/Makefile.am	2018-12-05 16:35:35.787618428 -0800
-@@ -1,18 +1,2 @@
- EXTRA_DIST = man.xsl
- 
--if HAVE_XSLTPROC
--miscmandir = $(MISC_MAN_DIR)
--miscman_PRE = xkeyboard-config.man
--miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
--CLEANFILES = $(miscman_DATA) $(miscman_PRE)
--SUFFIXES = .$(MISC_MAN_SUFFIX) .man
--MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g'
--
--xkeyboard-config.man: $(top_srcdir)/rules/evdev.xml $(srcdir)/man.xsl
--	$(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_srcdir)/rules/evdev.xml > $@
--
--# First sed swaps @appmansuffix@ back to __appmansuffix__ for the MAN_SUBSTS
--.man.$(MISC_MAN_SUFFIX):
--	$(SED) -e 's|@\(\<[a-z_]*\>\)@|__\1__|g' < $< | $(SED) $(MAN_SUBSTS) > $@
--
--endif

packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch

@@ -0,0 +1,15 @@
+--- /meson.build
++++ /meson.build
+@@ -4,7 +4,10 @@
+         meson_version: '>= 0.54.0')
+ 
+ dir_data        = join_paths(get_option('prefix'), get_option('datadir'))
+-dir_xkb_base    = join_paths(dir_data, 'X11', 'xkb')
++dir_xkb_base    = get_option('xkb-base')
++if dir_xkb_base == ''
++    dir_xkb_base    = join_paths(dir_data, 'X11', 'xkb')
++endif
+ dir_xkb_rules   = join_paths(dir_xkb_base, 'rules')
+ dir_man7        = join_paths(get_option('prefix'), get_option('mandir'), 'man7')
+ dir_pkgconfig   = join_paths(dir_data, 'pkgconfig')
+

packages/x11/lib/libXau/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXau"
-PKG_VERSION="1.0.9"
+PKG_VERSION="1.0.10"
-PKG_SHA256="ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec"
+PKG_SHA256="8be6f292334d2f87e5b919c001e149a9fdc27005d6b3e053862ac6ebbf1a0c0a"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros xorgproto"
 PKG_LONGDESC="X authorization file management libary"
 PKG_BUILD_FLAGS="+pic"

packages/x11/lib/libXfont2/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXfont2"
-PKG_VERSION="2.0.5"
+PKG_VERSION="2.0.6"
-PKG_SHA256="aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e"
+PKG_SHA256="74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros xtrans freetype libfontenc"
 PKG_LONGDESC="X font Library"
 

packages/x11/lib/libfontenc/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libfontenc"
-PKG_VERSION="1.1.4"
+PKG_VERSION="1.1.6"
-PKG_SHA256="2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079"
+PKG_SHA256="ea8606ed5255dda8f570b7d1a74d59ee8d198675b2f114d07807431e6ba1d111"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros zlib font-util xorgproto"
 PKG_LONGDESC="Libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts."
 PKG_BUILD_FLAGS="+pic"

packages/x11/lib/libxcvt/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libxcvt"
-PKG_VERSION="0.1.1"
+PKG_VERSION="0.1.2"
-PKG_SHA256="27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29"
+PKG_SHA256="0561690544796e25cfbd71806ba1b0d797ffe464e9796411123e79450f71db38"
 PKG_LICENSE="OSS"
 PKG_SITE="https://gitlab.freedesktop.org/xorg/lib/libxcvt"
 PKG_URL="https://www.x.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/x11/proto/xorgproto/package.mk

@@ -2,14 +2,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xorgproto"
-PKG_VERSION="2022.1"
+PKG_VERSION="2022.2"
-PKG_SHA256="1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6"
+PKG_SHA256="5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="combined X.Org X11 Protocol headers"
-PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_TARGET="-Dlegacy=false \
                        -Dpkgconfigdatadir=/usr/lib/pkgconfig"