lib32-waffle 1.8.0-1: upstream release

- swap lib32-systemd for lib32-libdrm
- use array for the meson options
- kill off unneeded local variable
- tabs to spaces for indent

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

2 files changed, 33 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb77d170945b..cd8c2eac1ad4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-waffle
 	pkgdesc = a library for choosing window system and OpenGL API at runtime (32 bits)
-	pkgver = 1.7.2
+	pkgver = 1.8.0
 	pkgrel = 1
 	url = https://waffle.freedesktop.org
 	arch = x86_64
@@ -12,17 +12,17 @@ pkgbase = lib32-waffle
 	makedepends = wayland-protocols
 	depends = lib32-libx11
 	depends = lib32-libxcb
-	depends = lib32-systemd
-	depends = waffle=1.7.2
+	depends = waffle=1.8.0
 	optdepends = lib32-libgl: for OpenGL or GLX support
 	optdepends = lib32-libgles: for GLES support
 	optdepends = lib32-libegl: for gbm, surfaceless, x11_egl or wayland support
 	optdepends = lib32-mesa: for gbm support
+	optdepends = lib32-libdrm: for gbm support
 	optdepends = lib32-wayland: for wayland support
-	source = https://waffle.freedesktop.org/files/release/waffle-1.7.2/waffle-1.7.2.tar.xz
-	source = https://waffle.freedesktop.org/files/release/waffle-1.7.2/waffle-1.7.2.tar.xz.asc
+	source = https://waffle.freedesktop.org/files/release/waffle-1.8.0/waffle-1.8.0.tar.xz
+	source = https://waffle.freedesktop.org/files/release/waffle-1.8.0/waffle-1.8.0.tar.xz.asc
 	validpgpkeys = 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D
-	sha256sums = f676195cfea58cc75ef2441c5616b2f1d5565a7d371a6aa655aff3cc67c7c2c9
+	sha256sums = 29f462b5ea93510f585ae59b09f1aef6f9bad7287c7b82a7e8bd88f766e3afc7
 	sha256sums = SKIP
 
 pkgname = lib32-waffle
diff --git a/PKGBUILD b/PKGBUILD
index e5a7965d7abb..79b51c1d30dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,55 @@
 # Maintainer: Emil Velikov <emil.l.velikov@gmail.com>
-# Maintainer: Yevhenii Kolesnikov <sigexp.acc@gmail.com>
+# Contributor: Yevhenii Kolesnikov <sigexp.acc@gmail.com>
 # Contributor: Ben Widawsky <ben@bwidawsk.net>
 # Contributor: Chad Versace <chad.versace@linux.intel.com>
 
-_pkgbasename=waffle
-pkgname=lib32-${_pkgbasename}
-pkgver=1.7.2
+pkgname=lib32-waffle
+pkgver=1.8.0
 pkgrel=1
 pkgdesc='a library for choosing window system and OpenGL API at runtime (32 bits)'
 arch=('x86_64')
 url='https://waffle.freedesktop.org'
 license=('BSD')
 
-depends=('lib32-libx11' 'lib32-libxcb' 'lib32-systemd' "${_pkgbasename}=${pkgver}")
+depends=('lib32-libx11' 'lib32-libxcb' "waffle=${pkgver}")
 optdepends=('lib32-libgl: for OpenGL or GLX support'
             'lib32-libgles: for GLES support'
             'lib32-libegl: for gbm, surfaceless, x11_egl or wayland support'
             'lib32-mesa: for gbm support'
+            'lib32-libdrm: for gbm support'
             'lib32-wayland: for wayland support')
+
 makedepends=('meson' 'xcb-proto' 'lib32-mesa' 'gcc-multilib' 'wayland-protocols')
 
 source=(https://waffle.freedesktop.org/files/release/waffle-${pkgver}/waffle-${pkgver}.tar.xz{,.asc})
-sha256sums=('f676195cfea58cc75ef2441c5616b2f1d5565a7d371a6aa655aff3cc67c7c2c9'
+sha256sums=('29f462b5ea93510f585ae59b09f1aef6f9bad7287c7b82a7e8bd88f766e3afc7'
             'SKIP')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D')
 
 build() {
-	export CC='gcc -m32'
-	export CXX='g++ -m32'
-	export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-	arch-meson "${_pkgbasename}-$pkgver" build \
-		--buildtype release \
-		--libdir=/usr/lib32 \
-		-D build-manpages=false \
-		-D build-htmldocs=false \
-		-D build-examples=false
-
-	meson compile -C build
+  local meson_args=(
+    --buildtype release
+    --libdir=/usr/lib32
+    -D build-manpages=false
+    -D build-htmldocs=false
+    -D build-examples=false
+  )
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  arch-meson "waffle-$pkgver" build "${meson_args[@]}"
+  meson compile -C build
 }
 
 package() {
-	meson install -C build --destdir "$pkgdir"
+  meson install -C build --destdir "$pkgdir"
 
-	mv "$pkgdir/usr/bin/wflinfo" "$pkgdir/usr/bin/wflinfo32"
-	rm -rf "$pkgdir/usr/include"
-	rm -rf "$pkgdir/usr/share"
+  mv "$pkgdir/usr/bin/wflinfo" "$pkgdir/usr/bin/wflinfo32"
+  rm -rf "$pkgdir/usr/include"
+  rm -rf "$pkgdir/usr/share"
 
-	install -m755 -d "$pkgdir/usr/share/licenses"
-	ln -s "${_pkgbasename}" "$pkgdir/usr/share/licenses/$pkgname"
+  install -m755 -d "$pkgdir/usr/share/licenses"
+  ln -s "waffle" "$pkgdir/usr/share/licenses/lib32-waffle"
 }