x11-libs/libdrm: disable noveua tests

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jory Pratt <anarchy@gentoo.org>

3 files changed, 27 insertions, 29 deletions

diff --git a/x11-libs/libdrm/files/fix-ioctl-102.patch b/x11-libs/libdrm/files/fix-ioctl-102.patch
deleted file mode 100644
index 50c475eb..00000000
--- a/x11-libs/libdrm/files/fix-ioctl-102.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6e24b7d1693f78ae83dc47f0ef7c0da3dfb2d590 Mon Sep 17 00:00:00 2001
-From: 
-Date: Sat, 1 Aug 2020 11:50:44 -0500
-Subject: [PATCH] Fix ioctl.h being redefined on musl
-
----
- tests/nouveau/threaded.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
-index ddbac74..d30ebaa 100644
---- a/tests/nouveau/threaded.c
-+++ b/tests/nouveau/threaded.c
-@@ -20,7 +20,10 @@
-  * OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
--#include <sys/ioctl.h>
-+// Use glibc's function prototype for ioctl()
-+#include <bits/ioctl.h>
-+int ioctl (int, unsigned long, ...);
-+
- #include <dlfcn.h>
- #include <fcntl.h>
- #include <stdio.h>
--- 
-2.26.2
-
diff --git a/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
new file mode 100644
index 00000000..18954893
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch
@@ -0,0 +1,26 @@
+From dc34852ecca82a19694178e8d346bf1f413a6e1e Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Sat, 1 Aug 2020 18:26:33 -0500
+Subject: [PATCH] don't build noveau tests
+
+---
+ tests/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 196edbf..651826b 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -44,9 +44,6 @@ endif
+ if with_etnaviv
+   subdir('etnaviv')
+ endif
+-if with_nouveau
+-  subdir('nouveau')
+-endif
+ 
+ drmsl = executable(
+   'drmsl',
+-- 
+2.26.2
+
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
index 20747b99..179bcef3 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
-PATCHES=( "${FILESDIR}"/fix-ioctl-102.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.4.102-disable-noveau-tests.patch )
 
 multilib_src_configure() {
 	local emesonargs=(