| 1 |
commit: c89101b74f39891972e2e8e1d2e10b622bb28237 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 1 23:33:53 2020 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 23:33:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c89101b7 |
| 7 |
|
| 8 |
x11-libs/libdrm: disable noveua tests |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-libs/libdrm/files/fix-ioctl-102.patch | 28 ---------------------- |
| 14 |
.../libdrm-2.4.102-disable-noveau-tests.patch | 26 ++++++++++++++++++++ |
| 15 |
x11-libs/libdrm/libdrm-2.4.102.ebuild | 2 +- |
| 16 |
3 files changed, 27 insertions(+), 29 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-libs/libdrm/files/fix-ioctl-102.patch b/x11-libs/libdrm/files/fix-ioctl-102.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 50c475e..0000000 |
| 21 |
--- a/x11-libs/libdrm/files/fix-ioctl-102.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,28 +0,0 @@ |
| 24 |
-From 6e24b7d1693f78ae83dc47f0ef7c0da3dfb2d590 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: |
| 26 |
-Date: Sat, 1 Aug 2020 11:50:44 -0500 |
| 27 |
-Subject: [PATCH] Fix ioctl.h being redefined on musl |
| 28 |
- |
| 29 |
---- |
| 30 |
- tests/nouveau/threaded.c | 5 ++++- |
| 31 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
| 32 |
- |
| 33 |
-diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c |
| 34 |
-index ddbac74..d30ebaa 100644 |
| 35 |
---- a/tests/nouveau/threaded.c |
| 36 |
-+++ b/tests/nouveau/threaded.c |
| 37 |
-@@ -20,7 +20,10 @@ |
| 38 |
- * OTHER DEALINGS IN THE SOFTWARE. |
| 39 |
- */ |
| 40 |
- |
| 41 |
--#include <sys/ioctl.h> |
| 42 |
-+// Use glibc's function prototype for ioctl() |
| 43 |
-+#include <bits/ioctl.h> |
| 44 |
-+int ioctl (int, unsigned long, ...); |
| 45 |
-+ |
| 46 |
- #include <dlfcn.h> |
| 47 |
- #include <fcntl.h> |
| 48 |
- #include <stdio.h> |
| 49 |
--- |
| 50 |
-2.26.2 |
| 51 |
- |
| 52 |
|
| 53 |
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 |
| 54 |
new file mode 100644 |
| 55 |
index 0000000..1895489 |
| 56 |
--- /dev/null |
| 57 |
+++ b/x11-libs/libdrm/files/libdrm-2.4.102-disable-noveau-tests.patch |
| 58 |
@@ -0,0 +1,26 @@ |
| 59 |
+From dc34852ecca82a19694178e8d346bf1f413a6e1e Mon Sep 17 00:00:00 2001 |
| 60 |
+From: Jory Pratt <anarchy@g.o> |
| 61 |
+Date: Sat, 1 Aug 2020 18:26:33 -0500 |
| 62 |
+Subject: [PATCH] don't build noveau tests |
| 63 |
+ |
| 64 |
+--- |
| 65 |
+ tests/meson.build | 3 --- |
| 66 |
+ 1 file changed, 3 deletions(-) |
| 67 |
+ |
| 68 |
+diff --git a/tests/meson.build b/tests/meson.build |
| 69 |
+index 196edbf..651826b 100644 |
| 70 |
+--- a/tests/meson.build |
| 71 |
++++ b/tests/meson.build |
| 72 |
+@@ -44,9 +44,6 @@ endif |
| 73 |
+ if with_etnaviv |
| 74 |
+ subdir('etnaviv') |
| 75 |
+ endif |
| 76 |
+-if with_nouveau |
| 77 |
+- subdir('nouveau') |
| 78 |
+-endif |
| 79 |
+ |
| 80 |
+ drmsl = executable( |
| 81 |
+ 'drmsl', |
| 82 |
+-- |
| 83 |
+2.26.2 |
| 84 |
+ |
| 85 |
|
| 86 |
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild |
| 87 |
index 20747b9..179bcef 100644 |
| 88 |
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild |
| 89 |
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild |
| 90 |
@@ -35,7 +35,7 @@ RDEPEND=" |
| 91 |
DEPEND="${RDEPEND} |
| 92 |
valgrind? ( dev-util/valgrind )" |
| 93 |
|
| 94 |
-PATCHES=( "${FILESDIR}"/fix-ioctl-102.patch ) |
| 95 |
+PATCHES=( "${FILESDIR}"/${PN}-2.4.102-disable-noveau-tests.patch ) |
| 96 |
|
| 97 |
multilib_src_configure() { |
| 98 |
local emesonargs=( |
Archives