[arch-commits] Commit in wayland/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Wednesday, February 12, 2020 @ 00:41:52
  Author: seblu
Revision: 375427

upgpkg: wayland 1.18.0-1

- New release
- Move to meson build system

Modified:
  wayland/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++---------------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-11 21:52:36 UTC (rev 375426)
+++ PKGBUILD	2020-02-12 00:41:52 UTC (rev 375427)
@@ -1,10 +1,10 @@
-# Maintainer: Tom Gundersen <teg at jklm.no>
 # Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Joel Teichroeb <joel at teichroeb.net>
 
 pkgbase=wayland
 pkgname=(wayland wayland-docs)
-pkgver=1.17.0
+pkgver=1.18.0
 pkgrel=1
 pkgdesc='A computer display server protocol'
 arch=('x86_64')
@@ -11,42 +11,28 @@
 url='https://wayland.freedesktop.org/'
 license=('MIT')
 depends=('glibc' 'libffi' 'expat' 'libxml2')
-makedepends=('libxslt' 'doxygen' 'xmlto' 'graphviz' 'docbook-xsl')
+makedepends=('meson' 'ninja' 'libxslt' 'doxygen' 'xmlto' 'graphviz' 'docbook-xsl')
 validpgpkeys=('C7223EBE4EF66513B892598911A30156E0E67611'  # Bryce Harrington
-              'C0066D7DB8E9AC6844D728715E54498E697F11D7') # Derek Foreman
+              'C0066D7DB8E9AC6844D728715E54498E697F11D7'  # Derek Foreman
+              '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48') # emersion <contact at emersion.fr>
 source=("https://wayland.freedesktop.org/releases/$pkgbase-$pkgver.tar.xz"{,.sig})
-sha1sums=('4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600'
-          'SKIP')
+sha256sums=('4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d'
+            'SKIP')
 
-prepare() {
-  cd $pkgbase-$pkgver
-}
-
 build() {
-  cd $pkgbase-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  meson build $pkgbase-$pkgver --buildtype=release --prefix=/usr
+  ninja -C build
 }
 
 check() {
-  cd $pkgbase-$pkgver
-
-  make check
+  ninja -C build test
 }
 
 package_wayland() {
-  cd $pkgbase-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  mkdir -p "$srcdir/docs/share"
-  mv "$pkgdir"/usr/share/{doc,man} "$srcdir/docs/share"
-
-  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  DESTDIR="$pkgdir" ninja -C build install
+  mkdir -p docs/share
+  mv "$pkgdir"/usr/share/{doc,man} docs/share
+  install -Dm 644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 package_wayland-docs() {
@@ -53,11 +39,8 @@
   pkgdesc+=" (documentation)"
   depends=()
 
-  cd $pkgbase-$pkgver
-
-  mv "$srcdir/docs" "$pkgdir/usr"
-
-  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  mv docs "$pkgdir/usr"
+  install -Dm 644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et: