summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD34
2 files changed, 25 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index de29c3c9b775..5d2b08fb6064 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
pkgbase = libdrm-git
pkgdesc = Userspace interface to kernel DRM services, master git version
- pkgver = 2.4.93.r0.g87fdbfb6
- pkgrel = 2
+ pkgver = 2.4.114.r2.ge699b28b
+ pkgrel = 1
url = http://dri.freedesktop.org/
arch = i686
arch = x86_64
license = custom
checkdepends = cairo
- makedepends = libxslt
- makedepends = docbook-xsl
+ checkdepends = cunit
+ makedepends = python-docutils
makedepends = meson
+ makedepends = git
+ makedepends = ninja
depends = libpciaccess
provides = libdrm
conflicts = libdrm
- source = libdrm::git://anongit.freedesktop.org/mesa/drm#branch=master
+ source = libdrm::git+https://gitlab.freedesktop.org/mesa/drm.git
source = COPYING
sha512sums = SKIP
sha512sums = b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
pkgname = libdrm-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4753e4913c76..2403ab38890f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,53 @@
-# Maintainer : Lone_Wolf <lonewolf at xs4all dot nl>
+# Maintainer : Lone_Wolf <lone_wolf@klaas-de-kat.nl>
# Contributor : Eric Engestrom <eric@engestrom.ch>
# Contributor : Jan de Groot <jgc@archlinux.org>
pkgname=libdrm-git
_realname=libdrm
-pkgver=2.4.93.r0.g87fdbfb6
-pkgrel=2
+pkgver=2.4.114.r2.ge699b28b
+pkgrel=1
pkgdesc="Userspace interface to kernel DRM services, master git version"
arch=(i686 x86_64)
license=('custom')
depends=('libpciaccess')
-makedepends=('libxslt' 'docbook-xsl' 'meson')
-checkdepends=('cairo')
+makedepends=('python-docutils' 'meson' 'git' 'ninja')
+checkdepends=('cairo' 'cunit')
url="http://dri.freedesktop.org/"
provides=('libdrm')
conflicts=('libdrm')
-source=('libdrm::git://anongit.freedesktop.org/mesa/drm#branch=master'
+source=('libdrm::git+https://gitlab.freedesktop.org/mesa/drm.git'
COPYING)
sha512sums=('SKIP'
'b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660')
-
-#prepare() {
-# cd $_pkgname
-# autoreconf -fi
-#}
-
pkgver() {
cd $_realname
- git describe --long --abbrev=8 | sed 's/^libdrm-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=8 | sed 's/^libdrm-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-build() {
+prepare() {
if [ -d _build ]; then
rm -rf _build
fi
+}
+
+build() {
meson setup libdrm _build \
--prefix /usr \
--buildtype plain \
--wrap-mode nofallback \
- -D udev=true
+ -D udev=false \
+ -D valgrind=disabled
+ meson configure --no-pager _build
ninja -C _build
}
check() {
- meson test -C _build
+ # '-t 10' is needed for the 'threaded' test, which uses the default meson
+ # test timeout of 30 seconds. This is too short for many systems. It can be
+ # removed if upstream fixes the issue.
+ meson test -C _build -t 10
}
package() {