[ptxdist] [PATCH] wlroots: version bump 0.5.0 -> 0.10.0

[ptxdist] [PATCH] wlroots: version bump 0.5.0 -> 0.10.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/wlroots.in   | 17 ++++++++++++++---
 rules/wlroots.make | 31 ++++++++++---------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/rules/wlroots.in b/rules/wlroots.in
index 47cfb8d9fad5..8b3fc250604b 100644
--- a/rules/wlroots.in
+++ b/rules/wlroots.in
@@ -13,9 +13,11 @@ menuconfig WLROOTS
 	select LIBINPUT
 	select LIBXKBCOMMON
 	select UDEV
-	select XCB_UTIL
 	select UDEV_LIBUDEV
 	select PIXMAN
+	select LIBCAP			if WLROOTS_LIBCAP
+	select SYSTEMD			if WLROOTS_SYSTEMD
+	select SYSTEMD_LOGIND		if WLROOTS_SYSTEMD_LOGIND
 	prompt "wlroots                       "
 	help
 	  wlroots provides pluggable, composable, unopinionated modules for
@@ -23,8 +25,17 @@ menuconfig WLROOTS
 
 if WLROOTS
 
-config WLROOTS_ROOTSTON
+config WLROOTS_LIBCAP
 	bool
-	prompt "install Rootston example compositor"
+	prompt "support rootless session via libcap"
+
+config WLROOTS_SYSTEMD
+	bool
+	default INITMETHOD_SYSTEMD
+
+config WLROOTS_SYSTEMD_LOGIND
+	bool
+	depends on WESTON_SYSTEMD
+	prompt "support rootless session via logind"
 
 endif
diff --git a/rules/wlroots.make b/rules/wlroots.make
index 777df18d52e1..76ed4bf78b7b 100644
--- a/rules/wlroots.make
+++ b/rules/wlroots.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WLROOTS) += wlroots
 #
 # Paths and names
 #
-WLROOTS_VERSION	:= 0.5.0
-WLROOTS_MD5	:= d186d57cd7aeca3d8af10e2d88575875
+WLROOTS_VERSION	:= 0.10.0
+WLROOTS_MD5	:= 758fa2f41ea888572db8052897b4482f
 WLROOTS		:= wlroots-$(WLROOTS_VERSION)
 WLROOTS_SUFFIX	:= tar.gz
 WLROOTS_URL	:= https://github.com/swaywm/wlroots/archive/$(WLROOTS_VERSION).$(WLROOTS_SUFFIX)
@@ -30,23 +30,16 @@ WLROOTS_LICENSE	:= MIT
 WLROOTS_CONF_TOOL := meson
 WLROOTS_CONF_OPT := \
 	$(CROSS_MESON_USR) \
-	-Denable-enable-examples=false \
-	-Denable-enable-rootston=$(call ptx/truefalse,PTXCONF_WLROOTS_ROOTSTON) \
-	-Denable-x11_backend=false \
-	-Denable-xwayland=false \
+	-Dlibcap=$(call ptx/endis, PTXCONF_WLROOTS_LIBCAP)d \
+	-Dlogind=$(call ptx/endis, PTXCONF_WLROOTS_SYSTEMD_LOGIND)d \
+	-Dlogind-provider=systemd \
+	-Dxcb-errors=disabled \
+	-Dxcb-icccm=disabled \
+	-Dxwayland=disabled \
+	-Dx11-backend=disabled \
+	-Dexamples=false \
 	-Dwerror=false
 
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/wlroots.install:
-	@$(call targetinfo)
-	@$(call world/install, WLROOTS)
-	@install -vD -m 755 $(WLROOTS_DIR)-build/rootston/rootston \
-		$(WLROOTS_PKGDIR)/usr/bin/rootston
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -62,10 +55,6 @@ $(STATEDIR)/wlroots.targetinstall:
 
 	@$(call install_lib, wlroots, 0, 0, 0644, libwlroots)
 
-ifdef PTXCONF_WLROOTS_ROOTSTON
-	@$(call install_copy, wlroots, 0, 0, 0755, -, /usr/bin/rootston)
-endif
-
 	@$(call install_finish, wlroots)
 
 	@$(call touch)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de