From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] wlroots: version bump 0.5.0 -> 0.10.0
Date: Fri, 21 Feb 2020 10:32:21 +0100 [thread overview]
Message-ID: <20200221093221.32381-1-p.zabel@pengutronix.de> (raw)
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
reply other threads:[~2020-02-21 9:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221093221.32381-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox