1 |
commit: 971f87322749c6890926e009a1eb10a6b44f562d |
2 |
Author: Drew Davenport <ddavenport <AT> chromium <DOT> org> |
3 |
AuthorDate: Wed Jun 3 16:56:01 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 3 19:25:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f8732 |
7 |
|
8 |
x11-apps/igt-gpu-tools: Fix USE flags dependency |
9 |
|
10 |
Test build is required for docs. Express this in REQUIRED_USE, |
11 |
and allow tests to be built without building docs. |
12 |
|
13 |
Signed-off-by: Drew Davenport <ddavenport <AT> chromium.org> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/16057 |
15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
16 |
|
17 |
x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild | 5 +++-- |
18 |
x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild | 5 +++-- |
19 |
x11-apps/igt-gpu-tools/metadata.xml | 1 + |
20 |
3 files changed, 7 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild |
23 |
index e87a5ccf4a7..b202d340de9 100644 |
24 |
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild |
25 |
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild |
26 |
@@ -20,13 +20,14 @@ else |
27 |
fi |
28 |
LICENSE="MIT" |
29 |
SLOT="0" |
30 |
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" |
31 |
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" |
32 |
REQUIRED_USE=" |
33 |
|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) |
34 |
overlay? ( |
35 |
video_cards_intel |
36 |
|| ( X xv ) |
37 |
) |
38 |
+ doc? ( tests ) |
39 |
" |
40 |
RESTRICT="test" |
41 |
|
42 |
@@ -93,7 +94,7 @@ src_configure() { |
43 |
$(meson_feature man) |
44 |
$(meson_feature overlay) |
45 |
$(meson_feature runner) |
46 |
- $(meson_feature doc tests) # Test build is required for docs |
47 |
+ $(meson_feature tests) |
48 |
$(meson_feature valgrind) |
49 |
$(meson_feature unwind libunwind) |
50 |
-Doverlay_backends=${overlay_backends%?} |
51 |
|
52 |
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
53 |
index e87a5ccf4a7..b202d340de9 100644 |
54 |
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
55 |
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
56 |
@@ -20,13 +20,14 @@ else |
57 |
fi |
58 |
LICENSE="MIT" |
59 |
SLOT="0" |
60 |
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" |
61 |
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" |
62 |
REQUIRED_USE=" |
63 |
|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) |
64 |
overlay? ( |
65 |
video_cards_intel |
66 |
|| ( X xv ) |
67 |
) |
68 |
+ doc? ( tests ) |
69 |
" |
70 |
RESTRICT="test" |
71 |
|
72 |
@@ -93,7 +94,7 @@ src_configure() { |
73 |
$(meson_feature man) |
74 |
$(meson_feature overlay) |
75 |
$(meson_feature runner) |
76 |
- $(meson_feature doc tests) # Test build is required for docs |
77 |
+ $(meson_feature tests) |
78 |
$(meson_feature valgrind) |
79 |
$(meson_feature unwind libunwind) |
80 |
-Doverlay_backends=${overlay_backends%?} |
81 |
|
82 |
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml |
83 |
index 887359bbc72..a8687797712 100644 |
84 |
--- a/x11-apps/igt-gpu-tools/metadata.xml |
85 |
+++ b/x11-apps/igt-gpu-tools/metadata.xml |
86 |
@@ -10,6 +10,7 @@ |
87 |
<flag name="man">Build and install man pages</flag> |
88 |
<flag name="overlay">Build the intel-gpu-overlay utility</flag> |
89 |
<flag name="runner">Build the test runner</flag> |
90 |
+ <flag name="tests">Build and install tests</flag> |
91 |
<flag name="valgrind">Support valgrind annotations</flag> |
92 |
<flag name="xv">Enable intel-gpu-overlay xv backend</flag> |
93 |
<flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag> |