diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in index af816a1349..1ac15ce368 100644 --- a/package/x11r7/xapp_xdm/Config.in +++ b/package/x11r7/xapp_xdm/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_XAPP_XDM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index 5ba3a3f062..daf1b0852f 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003148.html -sha256 e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 xdm-1.1.13.tar.xz -sha512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5 xdm-1.1.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003265.html +sha256 3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f xdm-1.1.14.tar.xz +sha512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 xdm-1.1.14.tar.xz # Locally computed sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 98306f66f5..035f2e9484 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.13 +XAPP_XDM_VERSION = 1.1.14 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.xz -XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDM_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDM_LICENSE = MIT XAPP_XDM_LICENSE_FILES = COPYING XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes @@ -16,7 +16,6 @@ XAPP_XDM_DEPENDENCIES = \ xlib_libX11 \ xlib_libXaw \ xlib_libXdmcp \ - xlib_libXinerama \ xlib_libXt \ xorgproto XAPP_XDM_CONF_OPTS = \ @@ -24,6 +23,13 @@ XAPP_XDM_CONF_OPTS = \ --with-utmp-file=/var/adm/utmpx \ --with-wtmp-file=/var/adm/wtmpx +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XAPP_XDM_CONF_OPTS += --with-xinerama +XAPP_XDM_DEPENDENCIES += xlib_libXinerama +else +XAPP_XDM_CONF_OPTS += --without-xinerama +endif + define XAPP_XDM_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \ $(TARGET_DIR)/etc/init.d/S99xdm