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

[Laurent Carlier]

    Date: Monday, December 13, 2021 @ 12:43:40
  Author: lcarlier
Revision: 1071611

upgpkg: lib32-wayland 1.20.0-1: upstream update 1.20.0

Modified:
  lib32-wayland/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 12:43:09 UTC (rev 1071610)
+++ PKGBUILD	2021-12-13 12:43:40 UTC (rev 1071611)
@@ -4,8 +4,8 @@
 # Contributor: Joel Teichroeb <joel at teichroeb.net>
 
 pkgname=lib32-wayland
-pkgver=1.19.0
-pkgrel=2
+pkgver=1.20.0
+pkgrel=1
 pkgdesc='A computer display server protocol'
 arch=(x86_64)
 url=https://wayland.freedesktop.org
@@ -17,40 +17,29 @@
   lib32-libxml2
   wayland
 )
-makedepends=(git)
-_tag=e60398b1755bfcdf09f040d3769131fe0d9762fc
-source=(git+https://gitlab.freedesktop.org/wayland/wayland.git#tag=${_tag})
-sha256sums=(SKIP)
+makedepends=(meson)
+validpgpkeys=('C7223EBE4EF66513B892598911A30156E0E67611'  # Bryce Harrington
+              'C0066D7DB8E9AC6844D728715E54498E697F11D7'  # Derek Foreman
+              '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48') # emersion <contact at emersion.fr>
+source=("https://wayland.freedesktop.org/releases/wayland-$pkgver.tar.xz"{,.sig})
+sha256sums=('b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725'
+            'SKIP')
 
-pkgver() {
-  cd wayland
-
-  git describe --tags
-}
-
-prepare() {
-  cd wayland
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
-  cd wayland
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
-  ./configure \
+  meson build wayland-$pkgver \
+    --buildtype=release \
     --prefix=/usr \
     --libdir=/usr/lib32 \
-    --disable-documentation \
-    --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+    -D documentation=false
+  ninja -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C wayland install
+  DESTDIR="$pkgdir" ninja -C build install
   rm -rf "${pkgdir}"/usr/{bin,include,share}
 
   install -dm 755 "${pkgdir}"/usr/share/licenses