summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2018-03-08 11:05:42 +0100
committerLW-archlinux2018-03-08 11:05:42 +0100
commitc3d6b53cbd6298db4702f0956626bfbf95292239 (patch)
tree95398515689af652dac05fedbd7d9d436a32fc4d
parent541586db058e54d73841227e49058d256a432924 (diff)
downloadaur-c3d6b53cbd6298db4702f0956626bfbf95292239.tar.gz
switched to meson for building
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD34
2 files changed, 17 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 726eebaea52..f1ee9f617b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libdrm-git
pkgdesc = Userspace interface to kernel DRM services, master git version
- pkgver = 2.4.89.r5.gde807d1a
+ pkgver = 2.4.91.r2.g45eee3fd
pkgrel = 1
url = http://dri.freedesktop.org/
arch = i686
@@ -9,9 +9,9 @@ pkgbase = libdrm-git
checkdepends = cairo
checkdepends = bcunit-cunit-compat
makedepends = valgrind
- makedepends = xorg-util-macros
makedepends = libxslt
makedepends = docbook-xsl
+ makedepends = meson
depends = libpciaccess
provides = libdrm
conflicts = libdrm
diff --git a/PKGBUILD b/PKGBUILD
index fedea135aae..5b77c7cb5ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
# Maintainer : Lone_Wolf <lonewolf at xs4all dot nl>
+# Contributor : Eric Engestrom <eric@engestrom.ch>
# Contributor : Jan de Groot <jgc@archlinux.org>
pkgname=libdrm-git
-_pkgname=libdrm
-pkgver=2.4.89.r5.gde807d1a
+_realname=libdrm
+pkgver=2.4.91.r2.g45eee3fd
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services, master git version"
arch=(i686 x86_64)
license=('custom')
depends=('libpciaccess')
-makedepends=('valgrind' 'xorg-util-macros' 'libxslt' 'docbook-xsl')
+makedepends=('valgrind' 'libxslt' 'docbook-xsl' 'meson')
checkdepends=('cairo' 'bcunit-cunit-compat')
url="http://dri.freedesktop.org/"
provides=('libdrm')
@@ -21,31 +22,26 @@ sha512sums=('SKIP'
'b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660')
-prepare() {
- cd $_pkgname
- autoreconf -fi
-}
+#prepare() {
+# cd $_pkgname
+# autoreconf -fi
+#}
pkgver() {
- cd $_pkgname
-# echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
- git describe --long | sed 's/^libdrm-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ cd $_realname
+ git describe --long --abbrev=8 | sed 's/^libdrm-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd $_pkgname
- ./configure --prefix=/usr --enable-udev
- make
+ arch-meson "$_realname" build -D udev=true
+ ninja -C build
}
check() {
- cd $_pkgname
- make -k check
+ meson test -C build
}
package() {
- cd $_pkgname
- make DESTDIR="$pkgdir" install
- install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
- install -m644 "$srcdir"/COPYING "$pkgdir"/usr/share/licenses/$pkgname/
+ DESTDIR="$pkgdir" ninja -C build install
+ install -Dt "$pkgdir"/usr/share/licenses/"$pkgname" -m644 COPYING
}