Update with https://github.com/Nefsen402/cage/tree/port-016

2 files changed, 49 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f13ed8c59917..0639f752ff9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,26 @@
 pkgbase = cage-git
-	pkgdesc = A Wayland kiosk
-	pkgver = 0.1.4.r0.g646b3e8
+	pkgdesc = Kiosk compositor for Wayland
+	pkgver = r281.c93c9ce
 	pkgrel = 1
-	epoch = 1
 	url = https://www.hjdskes.nl/projects/cage/
 	arch = x86_64
 	license = MIT
-	makedepends = meson
 	makedepends = git
+	makedepends = meson
+	makedepends = scdoc
 	makedepends = wayland-protocols
-	depends = wlroots-git
+	makedepends = xorg-server-xwayland
+	depends = glibc
 	depends = wayland
+	depends = wlroots>=0.16.0
 	depends = libxkbcommon
-	depends = xorg-server-xwayland
+	depends = pixman
+	optdepends = polkit: System privilege control. Required if not using seatd service
+	optdepends = xorg-server-xwayland: X11 support
+	provides = cage
+	conflicts = cage
 	options = debug
-	options = !strip
-	source = cage::git+https://github.com/Hjdskes/cage.git
-	sha1sums = SKIP
+	source = cage-git::git+https://github.com/Nefsen402/cage.git#branch=port-016
+	sha512sums = SKIP
 
 pkgname = cage-git
diff --git a/PKGBUILD b/PKGBUILD
index 6166f03ed185..889114ebbdaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,49 @@
-# Maintainer: gilbus <aur(AT)tinkershell.eu>
+# Maintainer: Kuan-Yen Chou <kychou2@illinois.edu>
+# Contributor: gilbus <aur(AT)tinkershell.eu>
+
 pkgname=cage-git
-_pkgname=cage
-pkgver=0.1.4.r0.g646b3e8
+pkgver=r281.c93c9ce
 pkgrel=1
-epoch=1
-license=("MIT")
-pkgdesc="A Wayland kiosk"
-makedepends=("meson" "git" "wayland-protocols")
-depends=("wlroots-git" "wayland" "libxkbcommon" "xorg-server-xwayland")
-arch=("x86_64")
+pkgdesc="Kiosk compositor for Wayland"
+depends=(glibc wayland "wlroots>=0.16.0" libxkbcommon pixman)
+makedepends=(git meson scdoc wayland-protocols xorg-server-xwayland)
+optdepends=(
+    'polkit: System privilege control. Required if not using seatd service'
+    'xorg-server-xwayland: X11 support'
+)
+arch=(x86_64)
 url="https://www.hjdskes.nl/projects/cage/"
-source=("${pkgname%-*}::git+https://github.com/Hjdskes/cage.git")
-sha1sums=("SKIP")
-#provides=("cage")
-#conflicts=("cage")
-options=(debug !strip)
+license=(MIT)
+provides=(cage)
+conflicts=(cage)
+#source=("${pkgname}::git+https://github.com/Hjdskes/cage.git")
+# Use Nefsen402's branch temporarily for wlroots 0.16
+source=("${pkgname}::git+https://github.com/Nefsen402/cage.git#branch=port-016")
+sha512sums=('SKIP')
+options=(debug)
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -c2-48
+    cd "$srcdir/$pkgname"
+    if git describe --long --tags >/dev/null 2>&1; then
+        git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    else
+        printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git describe --always)"
+    fi
 }
 
-prepare() {
-	cd "${srcdir}/${_pkgname}"
+build() {
+    cd "$srcdir/$pkgname"
 	meson --buildtype=release -Dxwayland=true --prefix /usr "$srcdir/build"
+	ninja -C "$srcdir/build"
 }
 
-build() {
-	cd "${srcdir}/${_pkgname}"
-	ninja -C "$srcdir/build"
+check() {
+    ninja -C "$srcdir/build" test
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}"
-	DESTDIR="$pkgdir/" ninja -C "$srcdir/build" install
+    cd "$srcdir/$pkgname"
+    DESTDIR="$pkgdir" meson install -C "$srcdir/build"
+    install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
+    install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }