@@ -1,12 +1,12 @@
config BR2_PACKAGE_AT_SPI2_CORE
bool "at-spi2-core"
- depends on BR2_PACKAGE_XORG7 # xlib-libxtst
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
depends on BR2_USE_MMU # glib2
depends on BR2_USE_WCHAR # glib2
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_XLIB_LIBXTST
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11
help
The At-Spi2 Core package is a part of the GNOME
Accessibility Project. It provides a Service Provider
@@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE
comment "at-spi2-core needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "at-spi2-core depends on X.org"
- depends on BR2_USE_MMU
- depends on !BR2_PACKAGE_XORG7
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum
-sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz
+# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum
+sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz
# locally calculated
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
@@ -4,17 +4,31 @@
#
################################################################################
-AT_SPI2_CORE_VERSION_MAJOR = 2.36
-AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0
+AT_SPI2_CORE_VERSION_MAJOR = 2.47
+AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1
AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz
AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR)
AT_SPI2_CORE_LICENSE = LGPL-2.1+
AT_SPI2_CORE_LICENSE_FILES = COPYING
AT_SPI2_CORE_INSTALL_STAGING = YES
-AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \
+AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \
$(TARGET_NLS_DEPENDENCIES)
AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon
+ifeq ($(BR2_PACKAGE_XORG7),y)
+AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled
+AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst
+else
+AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled
+AT_SPI2_CORE_DEPENDENCIES += gobject-introspection
+else
+AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled
+endif
+
AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
$(eval $(meson-package))
https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang <d.lang@abatec.at> --- Changes v1 -> v2: - No changes --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-)