summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom2019-06-07 13:07:00 +0100
committerEric Engestrom2019-06-07 13:21:54 +0100
commit610f9e3cc45a9bdcdc2a3af719bae6433998b607 (patch)
tree910fa25d6181453cdbc9b365e964ebe2074d3f8f
parent3e3363a88f8b43e3b1ea5749c7526ba1019ce676 (diff)
downloadaur-610f9e3cc45a9bdcdc2a3af719bae6433998b607.tar.gz
update to v1.6.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD59
2 files changed, 38 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d59124aaa3d6..5d97277f208a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Nov 22 18:55:37 UTC 2017
pkgbase = waffle
pkgdesc = a library for choosing window system and OpenGL API at runtime
- pkgver = 1.5.2
- pkgrel = 4
+ pkgver = 1.6.0
+ pkgrel = 1
url = http://www.waffle-gl.org
arch = x86_64
license = BSD
@@ -16,8 +14,8 @@ pkgbase = waffle
depends = libx11
depends = libxcb
depends = wayland
- source = https://github.com/waffle-gl/waffle/archive/v1.5.2.tar.gz
- sha256sums = d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b
+ source = https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.6.0/waffle-v1.6.0.tar.gz
+ sha256sums = d2ee1eef9f0e35ae1cd916db24e46ce4358c94a82776dcb89f5f72bd97a7e9ba
pkgname = waffle
diff --git a/PKGBUILD b/PKGBUILD
index 19c02c852793..a95c789a24a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Ben Widawsky <ben@bwidawsk.net>
+# Maintainer: Eric Engestrom <aur@engestrom.ch>
+# Contributor: Ben Widawsky <ben@bwidawsk.net>
# Contributor: Chad Versace <chad.versace@linux.intel.com>
# Contributor: Emil Velikov <emil.l.velikov@gmail.com>
pkgname=waffle
-pkgver=1.5.2
-pkgrel=4
+pkgver=1.6.0
+pkgrel=1
pkgdesc='a library for choosing window system and OpenGL API at runtime'
arch=('x86_64')
url='http://www.waffle-gl.org'
@@ -13,31 +14,39 @@ license=('BSD')
depends=('libx11' 'libxcb' 'wayland')
makedepends=('cmake' 'xcb-proto' 'mesa-libgl' 'mesa' 'libxslt' 'docbook-xsl')
-source=("https://github.com/waffle-gl/waffle/archive/v$pkgver.tar.gz")
-sha256sums=('d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b')
+source=("https://gitlab.freedesktop.org/mesa/waffle/-/archive/v$pkgver/waffle-v$pkgver.tar.gz")
+sha256sums=('d2ee1eef9f0e35ae1cd916db24e46ce4358c94a82776dcb89f5f72bd97a7e9ba')
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+ if [ -d build ]
+ then
+ msg2 "Build dir already exist; performing an incremental build"
+ msg2 "If you want to perform a clean build, please delete $(realpath build)"
+ return
+ fi
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_BUILD_TYPE=Release \
- -Dwaffle_has_gbm=1 \
- -Dwaffle_has_glx=1 \
- -Dwaffle_has_x11_egl=1 \
- -Dwaffle_has_wayland=1 \
- -Dwaffle_build_manpages=1 \
- -Dwaffle_build_htmldocs=1 \
- -Dwaffle_build_examples=0
- make
+ cmake \
+ -G Ninja \
+ -S "$pkgname-v$pkgver" -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -Dwaffle_has_gbm=1 \
+ -Dwaffle_has_glx=1 \
+ -Dwaffle_has_x11_egl=1 \
+ -Dwaffle_has_wayland=1 \
+ -Dwaffle_build_manpages=1 \
+ -Dwaffle_build_htmldocs=1 \
+ -Dwaffle_build_examples=0
}
-package() {
- cd "$srcdir/$pkgname-$pkgver"
+build() {
+ ninja -C build
+}
- make DESTDIR="$pkgdir/" install
- install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
- install -m644 "$pkgdir/usr/share/doc/waffle1/LICENSE.txt" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 "$pkgdir/usr/share/doc/waffle1/LICENSE.txt" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
}