summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/libdrm/APKBUILD41
-rw-r--r--user/libdrm/ioctl.patch11
2 files changed, 18 insertions, 34 deletions
diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD
index 59c09b360..99534d596 100644
--- a/user/libdrm/APKBUILD
+++ b/user/libdrm/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libdrm
-pkgver=2.4.100
+pkgver=2.4.101
pkgrel=0
pkgdesc="Userspace interface to kernel DRM services"
url="https://dri.freedesktop.org/"
@@ -12,39 +12,34 @@ depends=""
depends_dev="linux-headers"
checkdepends="bash cunit-dev"
makedepends="$depends_dev bash eudev-dev libpciaccess-dev libpthread-stubs
- xmlto"
+ meson ninja xmlto"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
- ioctl.patch
- "
+source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
case $CARCH in
- arm*|aarch64*) _arch_conf="--enable-omap-experimental-api
- --enable-exynos-experimental-api
- --enable-tegra-experimental-api" ;;
+ arm*|aarch64*) _arch_conf="-Domap=true
+ -Dexynos=true
+ -Detnaviv=true
+ -Dtegra=true" ;;
esac
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --enable-udev \
- --disable-valgrind \
- $_arch_conf
- make
+ meson \
+ -Dprefix=/usr \
+ -Dman-pages=true \
+ -Dudev=true \
+ -Dvalgrind=false \
+ $_arch_conf \
+ build
+ ninja -C build
}
check() {
- make check
+ ninja -C build test
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2
-af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch"
+sha512sums="658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz"
diff --git a/user/libdrm/ioctl.patch b/user/libdrm/ioctl.patch
deleted file mode 100644
index 9ffe5f933..000000000
--- a/user/libdrm/ioctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdrm-2.4.83/tests/nouveau/threaded.c
-+++ libdrm-2.4.83/tests/nouveau/threaded.c
-@@ -40,7 +40,7 @@
-
- static int import_fd;
-
--int ioctl(int fd, unsigned long request, ...)
-+int ioctl(int fd, int request, ...)
- {
- va_list va;
- int ret;