Switch from 0.15 branch to master

3 files changed, 32 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b39cca4d76a..9a0daf4e1a22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,34 @@
 pkgbase = sway-git
-	pkgdesc = i3 compatible window manager for Wayland
-	pkgver = r2587.22db6013
+	pkgdesc = i3-compatible Wayland compositor
+	pkgver = r4818.183a4b0d
 	pkgrel = 1
-	url = http://swaywm.org
-	install = sway-git.install
+	url = https://swaywm.org
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = cmake
+	makedepends = meson
 	makedepends = git
-	makedepends = asciidoc
-	depends = wlc-git
-	depends = xorg-server-xwayland
-	depends = xcb-util-image
+	makedepends = scdoc
+	makedepends = wayland-protocols
 	depends = json-c
-	depends = pango
-	depends = cairo
+	depends = pcre
+	depends = wlroots-git
 	depends = wayland
+	depends = libxkbcommon
+	depends = cairo
+	depends = pango
 	depends = gdk-pixbuf2
+	depends = pixman
+	depends = libcap
+	depends = libinput
+	depends = pam
+	depends = xorg-server-xwayland
 	optdepends = rxvt-unicode: Default terminal emulator.
 	optdepends = dmenu: Default for launching applications.
-	optdepends = imagemagick: For taking screenshots.
-	optdepends = ffmpeg: For recording screencasts.
 	optdepends = i3status: To display system information with a bar.
 	provides = sway
 	conflicts = sway
-	source = sway::git+https://github.com/SirCmpwn/sway.git#branch=0.15
+	source = sway::git+https://github.com/swaywm/sway.git
 	sha1sums = SKIP
 
 pkgname = sway-git
diff --git a/PKGBUILD b/PKGBUILD
index 8821a7962f05..66072a57a052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,26 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=sway-git
 _pkgname=sway
-pkgver=r2587.22db6013
+pkgver=r4818.183a4b0d
 pkgrel=1
-license=('MIT')
-pkgdesc='i3 compatible window manager for Wayland'
-makedepends=("cmake" "git" "asciidoc")
+license=("MIT")
+pkgdesc="i3-compatible Wayland compositor"
+makedepends=("meson" "git" "scdoc" "wayland-protocols")
 depends=(
-	"wlc-git" "xorg-server-xwayland"
-	"xcb-util-image" "json-c"
-	"pango" "cairo"
-	"wayland" "gdk-pixbuf2"
+	"json-c" "pcre" "wlroots-git" "wayland" "libxkbcommon" "cairo" "pango"
+	"gdk-pixbuf2" "pixman" "libcap" "libinput" "pam" "xorg-server-xwayland"
 )
 optdepends=(
 	"rxvt-unicode: Default terminal emulator."
 	"dmenu: Default for launching applications."
-	"imagemagick: For taking screenshots."
-	"ffmpeg: For recording screencasts."
 	"i3status: To display system information with a bar."
 )
 arch=("i686" "x86_64")
-url='http://swaywm.org'
-source=("${pkgname%-*}::git+https://github.com/SirCmpwn/sway.git#branch=0.15")
-sha1sums=('SKIP')
-provides=('sway')
-conflicts=('sway')
-install=sway-git.install
+url="https://swaywm.org"
+source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git")
+sha1sums=("SKIP")
+provides=("sway")
+conflicts=("sway")
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
@@ -34,16 +29,12 @@ pkgver() {
 
 build() {
 	cd "${srcdir}/${_pkgname}"
-
-	cmake . \
-        -DCMAKE_BUILD_TYPE=Upstream \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-        -DCMAKE_INSTALL_PREFIX=/usr
-	make
+	rm -rf "$srcdir/build"
+	meson -Dwerror=false --prefix /usr "$srcdir/build"
+	ninja -C "$srcdir/build"
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}"
-
-	DESTDIR="$pkgdir/" make install
+	DESTDIR="$pkgdir/" ninja -C "$srcdir/build" install
 }
diff --git a/sway-git.install b/sway-git.install
deleted file mode 100644
index 145f3881ead5..000000000000
--- a/sway-git.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-    setcap cap_sys_ptrace=eip /usr/bin/sway
-}