From cce9eeac8b70878cb0a0f6a990aa99e517529e10 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 11 Aug 2021 14:11:57 +0300 Subject: [PATCH] package/wlroots: bump to version 0.14.1 Update to version 0.14.1, and adapt to upstream changes: - seatd/libseat is now used unconditionally, the logind/elogind build options have been removed (which can be used through seatd, no functionality is lost). - Now wlroots includes a software-based renderer (which uses pixman), and the OpenGL ES one is optional. For now it is left always enabled (as it was before) but this could be changed in the future. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wlroots/Config.in | 1 + package/wlroots/wlroots.hash | 4 ++-- package/wlroots/wlroots.mk | 19 +++---------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 41f8986772..8d485992f5 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_WLROOTS select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_SEATD select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS help diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 024ea93cae..fdebe1ef68 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.13.0/wlroots-0.13.0.tar.gz.sig -sha256 f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 wlroots-0.13.0.tar.gz +# 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 # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 0696d037df..89d5024176 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.13.0 +WLROOTS_VERSION = 0.14.1 WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -18,11 +18,12 @@ WLROOTS_DEPENDENCIES = \ libegl \ libgles \ pixman \ + seatd \ udev \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Drenderers=gles2 ifeq ($(BR2_PACKAGE_FFMPEG),y) WLROOTS_DEPENDENCIES += ffmpeg @@ -32,13 +33,6 @@ ifeq ($(BR2_PACKAGE_LIBPNG),y) WLROOTS_DEPENDENCIES += libpng endif -ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) -WLROOTS_CONF_OPTS += -Dlogind=enabled -Dlogind-provider=systemd -WLROOTS_DEPENDENCIES += systemd -else -WLROOTS_CONF_OPTS += -Dlogind=disabled -endif - ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 @@ -46,11 +40,4 @@ else WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_SEATD),y) -WLROOTS_CONF_OPTS += -Dlibseat=enabled -WLROOTS_DEPENDENCIES += seatd -else -WLROOTS_CONF_OPTS += -Dlibseat=disabled -endif - $(eval $(meson-package)) -- 2.30.2