diff options
Diffstat (limited to 'user/libdrm')
-rw-r--r-- | user/libdrm/APKBUILD | 45 | ||||
-rw-r--r-- | user/libdrm/ioctl.patch | 11 |
2 files changed, 24 insertions, 32 deletions
diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index f9feee145..78e867d8a 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.99 +pkgver=2.4.123 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -10,35 +10,38 @@ options="!check" license="MIT" depends="" depends_dev="linux-headers" -makedepends="$depends_dev bash eudev-dev libpciaccess-dev libpthread-stubs - xmlto" checkdepends="bash cunit-dev" +makedepends="$depends_dev bash cairo-dev eudev-dev libpciaccess-dev libpthread-stubs + libatomic_ops-dev meson ninja py3-docutils 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() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-freedreno \ - --enable-udev \ - --disable-valgrind - make + case $CARCH in + arm*|aarch64*) _arch_conf=" + -Domap=enabled + -Dexynos=enabled + -Detnaviv=enabled + -Dtegra=enabled + " ;; + esac + + meson \ + -Dprefix=/usr \ + -Dman-pages=enabled \ + -Dudev=true \ + -Dvalgrind=disabled \ + $_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="04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191 libdrm-2.4.99.tar.bz2 -af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch" +sha512sums="d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d libdrm-2.4.123.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; |