diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-04-18 22:09:25 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-04-18 23:34:26 +0000 |
| commit | af2f34c777eef8696f0358c743247e5480633261 (patch) | |
| tree | ab4e7a2f140f78101e9c6c380c8df3433e3799cd | |
| parent | 8c80131aaf28ad546553c8d9e99ab4244fcb0a77 (diff) | |
| download | ports-af2f34c777eef8696f0358c743247e5480633261.tar.gz ports-af2f34c777eef8696f0358c743247e5480633261.zip | |
x11-toolkits/wlroots: move CONSOLEKIT as BASU to sysutils/seatd
- wlroots >= 0.14 is libseat-only per https://github.com/swaywm/wlroots/commit/7f0908546149
- WLR_SESSION currently defaults to libseat even if CONSOLEKIT is enabled
- mutter and plasma5-kwin if ever ported to libseat may want to use ConsoleKit2
- Enable BASU by default as the dependency is already pulled by sway and mako
| -rw-r--r-- | sysutils/seatd/Makefile | 17 | ||||
| -rw-r--r-- | sysutils/seatd/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/wlroots/Makefile | 14 | ||||
| -rw-r--r-- | x11-toolkits/wlroots/distinfo | 2 |
4 files changed, 20 insertions, 17 deletions
diff --git a/sysutils/seatd/Makefile b/sysutils/seatd/Makefile index cb29829ed79c..22a5faa9fe86 100644 --- a/sysutils/seatd/Makefile +++ b/sysutils/seatd/Makefile @@ -1,6 +1,6 @@ PORTNAME= seatd DISTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://git.sr.ht/~kennylevinsen/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -22,8 +22,19 @@ PLIST_FILES= bin/${PORTNAME} \ lib/libseat.so.1 \ libdata/pkgconfig/libseat.pc -OPTIONS_DEFINE= MANPAGES SUID -OPTIONS_DEFAULT=MANPAGES SUID +OPTIONS_DEFINE= BASU MANPAGES SUID +OPTIONS_DEFAULT=BASU MANPAGES SUID + +# https://lists.sr.ht/~kennylevinsen/seatd-devel/%3CQHZRRQ.73ZI29COPK131%40unrelenting.technology%3E +BASU_DESC= ConsoleKit2 support via basu (experimental) +BASU_PATCH_SITES= https://github.com/DankBSD/${PORTNAME}/commit/:ck2 +BASU_PATCHFILES= 7bfae6ecb3bb.patch:-p1:ck2 a7f1269a883b.patch:-p1:ck2 +BASU_LIB_DEPENDS= libbasu.so:devel/basu +BASU_USES= localbase # https://github.com/emersion/basu/issues/36 +BASU_MESON_ENABLED= consolekit2 +.if make(makesum) +.MAKEFLAGS: WITH+=BASU +.endif MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages diff --git a/sysutils/seatd/distinfo b/sysutils/seatd/distinfo index fb3c1cc710b4..2b1f93a9e031 100644 --- a/sysutils/seatd/distinfo +++ b/sysutils/seatd/distinfo @@ -3,3 +3,7 @@ SHA256 (seatd-0.5.0.tar.gz) = 274b56324fc81ca6002bc1cdd387668dee34a6e1063e5f3896 SIZE (seatd-0.5.0.tar.gz) = 34762 SHA256 (5ad91ae9dad2.patch) = 496825a9f6c1b3e501a6446934229e9e3ff82a8c07a07f6d8cc649886a16ae3f SIZE (5ad91ae9dad2.patch) = 910 +SHA256 (7bfae6ecb3bb.patch) = d5e09414c822880e2c20604a502bab2f2d3eb732a63922359ca8a53ee6e71dc7 +SIZE (7bfae6ecb3bb.patch) = 1470 +SHA256 (a7f1269a883b.patch) = b3e5216b1f5cfe0124a89c2e2b8499b12aad1766609cb5ba1c29ba9c632263c7 +SIZE (a7f1269a883b.patch) = 19925 diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 5e01e8ca5649..7191d30827f5 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,6 +1,6 @@ PORTNAME= wlroots DISTVERSION= 0.13.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -32,20 +32,10 @@ USE_LDCONFIG= yes GH_ACCOUNT= swaywm MESON_ARGS= -Dexamples=false -OPTIONS_DEFINE= CONSOLEKIT LIBSEAT NVIDIA UUID X11 +OPTIONS_DEFINE= LIBSEAT NVIDIA UUID X11 OPTIONS_DEFAULT=LIBSEAT UUID X11 OPTIONS_SUB= yes -CONSOLEKIT_DESC= DRM sessions without root via ConsoleKit2 (experimental) -CONSOLEKIT_PATCH_SITES= https://github.com/unrelentingtech/${GH_PROJECT}/commit/:ck2 -CONSOLEKIT_PATCHFILES= fb837ae10b1f.patch:-p1:ck2 # https://github.com/swaywm/wlroots/pull/1467 -CONSOLEKIT_LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libconsolekit.so:sysutils/consolekit2 -CONSOLEKIT_MESON_ENABLED= consolekit2 -.if make(makesum) -.MAKEFLAGS: WITH+=CONSOLEKIT -.endif - LIBSEAT_DESC= DRM sessions with/without root via libseat LIBSEAT_LIB_DEPENDS= libseat.so:sysutils/seatd LIBSEAT_MESON_ENABLED= libseat diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index d797fa4fa287..7c3b241c11b7 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -5,7 +5,5 @@ SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da21 SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (e1b5323f56c3.patch) = 13145323caf9e56412ee3766fb9eacca9c6e4ca7088a320e79bc1512c0afe522 SIZE (e1b5323f56c3.patch) = 4028 -SHA256 (fb837ae10b1f.patch) = ecf07d813ae796eca946e909a35434a93b07fc349d6ca8b48d7834cb2dfb4071 -SIZE (fb837ae10b1f.patch) = 27075 SHA256 (eba4b66f92ca.patch) = a271c30c414fb2ae2cb6e0cbca77c37c1e15a3b160097f6e78298bfcec8df352 SIZE (eba4b66f92ca.patch) = 96009 |