Change build system to meson. General improvements.

1 files changed, 13 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 675aeb520ffc..5c955d9b5e69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,40 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
 # Contributor: Scimmia
 
 pkgbase=wayland-git
 pkgname=('wayland-git' 'wayland-docs-git')
-pkgver=1.17.0.r6.gb77cf86
+pkgver=1.18.0.r18.gef611a80
 pkgrel=1
-pkgdesc='A computer display server protocol'
+pkgdesc='A computer display server protocol (git version)'
 arch=('x86_64')
 url='https://wayland.freedesktop.org/'
 license=('MIT')
 depends=('glibc' 'libffi' 'expat' 'libxml2')
-makedepends=('git' 'libxslt' 'doxygen' 'xmlto' 'graphviz' 'docbook-xsl')
+makedepends=('git' 'meson' 'ninja' 'libxslt' 'doxygen' 'xmlto' 'graphviz' 'docbook-xsl')
 source=('git+https://gitlab.freedesktop.org/wayland/wayland.git')
 sha256sums=('SKIP')
 
-prepare() {
-    mkdir -p docs/share
-}
-
 pkgver() {
-    cd wayland
-    
-    # git, tags available
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+    git -C wayland describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-    cd wayland
-    
-    ./autogen.sh \
-        --prefix='/usr' \
-        --disable-static
-        
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    
-    make
+    meson build wayland --buildtype='release' --prefix='/usr'
 }
 
 check() {
-    cd wayland
-    
-    make check
+    ninja -C build test
 }
 
 package_wayland-git() {
     provides=("wayland=${pkgver}")
     conflicts=('wayland')
     
-    cd wayland
-    
-    make DESTDIR="$pkgdir" install
-    
-    mv "$pkgdir"/usr/share/{doc,man} "${srcdir}/docs/share"
-    
-    install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    DESTDIR="$pkgdir" ninja -C build install
+    mkdir -p docs/share
+    mv "${pkgdir}/usr/share/"{doc,man} docs/share
+    install -D -m644 wayland/COPYING "$p{kgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_wayland-docs-git() {
@@ -64,9 +44,6 @@ package_wayland-docs-git() {
     provides=("wayland-docs=${pkgver}")
     conflicts=('wayland-docs')
     
-    cd wayland
-    
-    mv "${srcdir}/docs" "${pkgdir}/usr"
-    
-    install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    mv docs "${pkgdir}/usr"
+    install -D -m644 wayland/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }