diff --git a/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch b/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch new file mode 100644 index 0000000000..a1ac62e882 --- /dev/null +++ b/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch @@ -0,0 +1,15 @@ +--- tests/meson.build ++++ tests/meson.build +@@ -44,9 +44,9 @@ endif + if with_etnaviv + subdir('etnaviv') + endif +-if with_nouveau +- subdir('nouveau') +-endif ++#if with_nouveau ++# subdir('nouveau') ++#endif + + drmsl = executable( + 'drmsl', diff --git a/srcpkgs/libdrm/patches/fix-noveau-threaded_c-ioctl.patch b/srcpkgs/libdrm/patches/fix-noveau-threaded_c-ioctl.patch deleted file mode 100644 index 751795ca9b..0000000000 --- a/srcpkgs/libdrm/patches/fix-noveau-threaded_c-ioctl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- tests/nouveau/threaded.c -+++ 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; - diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 758b88ab44..820ce8a9e4 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,21 +1,17 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.89 +version=2.4.91 revision=1 -build_style=gnu-configure -configure_args="--enable-udev --disable-valgrind" -hostmakedepends="libtool automake pkg-config xorg-util-macros" +configure_args="-Dudev=true -Dvalgrind=false" +build_style=meson +hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libpciaccess-devel" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " homepage="https://dri.freedesktop.org/" license="MIT" distfiles="https://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e - -pre_configure() { - autoreconf -fi -} +checksum=634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800 libdrm-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}"