commit: 971f87322749c6890926e009a1eb10a6b44f562d Author: Drew Davenport <ddavenport <AT> chromium <DOT> org> AuthorDate: Wed Jun 3 16:56:01 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Jun 3 19:25:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f8732
x11-apps/igt-gpu-tools: Fix USE flags dependency Test build is required for docs. Express this in REQUIRED_USE, and allow tests to be built without building docs. Signed-off-by: Drew Davenport <ddavenport <AT> chromium.org> Closes: https://github.com/gentoo/gentoo/pull/16057 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild | 5 +++-- x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild | 5 +++-- x11-apps/igt-gpu-tools/metadata.xml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) 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 index e87a5ccf4a7..b202d340de9 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild @@ -20,13 +20,14 @@ else fi LICENSE="MIT" SLOT="0" -IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" +IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" REQUIRED_USE=" || ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) + doc? ( tests ) " RESTRICT="test" @@ -93,7 +94,7 @@ src_configure() { $(meson_feature man) $(meson_feature overlay) $(meson_feature runner) - $(meson_feature doc tests) # Test build is required for docs + $(meson_feature tests) $(meson_feature valgrind) $(meson_feature unwind libunwind) -Doverlay_backends=${overlay_backends%?} diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild index e87a5ccf4a7..b202d340de9 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild @@ -20,13 +20,14 @@ else fi LICENSE="MIT" SLOT="0" -IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" +IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" REQUIRED_USE=" || ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) + doc? ( tests ) " RESTRICT="test" @@ -93,7 +94,7 @@ src_configure() { $(meson_feature man) $(meson_feature overlay) $(meson_feature runner) - $(meson_feature doc tests) # Test build is required for docs + $(meson_feature tests) $(meson_feature valgrind) $(meson_feature unwind libunwind) -Doverlay_backends=${overlay_backends%?} diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml index 887359bbc72..a8687797712 100644 --- a/x11-apps/igt-gpu-tools/metadata.xml +++ b/x11-apps/igt-gpu-tools/metadata.xml @@ -10,6 +10,7 @@ <flag name="man">Build and install man pages</flag> <flag name="overlay">Build the intel-gpu-overlay utility</flag> <flag name="runner">Build the test runner</flag> + <flag name="tests">Build and install tests</flag> <flag name="valgrind">Support valgrind annotations</flag> <flag name="xv">Enable intel-gpu-overlay xv backend</flag> <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
