diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 8d485992f5..84a4ef846e 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_WLROOTS wlroots is a modular Wayland library for building compositors which implements many of their common features. - https://github.com/swaywm/wlroots + https://gitlab.freedesktop.org/wlroots/wlroots if BR2_PACKAGE_WLROOTS diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index fdebe1ef68..04bbd65e43 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.14.1/wlroots-0.14.1.tar.gz.sig -sha256 448a83d579ac280357c8a4e902b9477bacbab81cc4d9c140e443642d458869db wlroots-0.14.1.tar.gz +# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.15.1/downloads/wlroots-0.15.1.tar.gz.sig +sha256 5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 wlroots-0.15.1.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 89d5024176..baa1edd9e1 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,8 +4,8 @@ # ################################################################################ -WLROOTS_VERSION = 0.14.1 -WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) +WLROOTS_VERSION = 0.15.1 +WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE WLROOTS_INSTALL_STAGING = YES @@ -25,19 +25,16 @@ WLROOTS_DEPENDENCIES = \ WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Drenderers=gles2 -ifeq ($(BR2_PACKAGE_FFMPEG),y) -WLROOTS_DEPENDENCIES += ffmpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WLROOTS_DEPENDENCIES += libpng -endif +WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) -WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled +WLROOTS_BACKENDS += x11 +WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 else -WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled +WLROOTS_CONF_OPTS += -Dxwayland=disabled endif +WLROOTS_CONF_OPTS += -Dbackends=$(subst $(space),$(comma),$(strip $(WLROOTS_BACKENDS))) + $(eval $(meson-package))