From 906eaa04d5b56c1b5c7fb3afa1cf33ec92b40279 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 7 Mar 2017 20:57:08 -0800 Subject: [PATCH] media-libs/mesa: Build radeonsi if only VIDEO_CARDS="radeon" is selected. Bug: https://bugs.gentoo.org/611928 --- media-libs/mesa/mesa-13.0.5.ebuild | 5 +++-- media-libs/mesa/mesa-17.0.1.ebuild | 5 +++-- media-libs/mesa/mesa-9999.ebuild | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/media-libs/mesa/mesa-13.0.5.ebuild b/media-libs/mesa/mesa-13.0.5.ebuild index 8aa4db9db5a5..c4fbbc5b7887 100644 --- a/media-libs/mesa/mesa-13.0.5.ebuild +++ b/media-libs/mesa/mesa-13.0.5.ebuild @@ -263,8 +263,9 @@ multilib_src_configure() { gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 + ! use video_cards_r600 && \ + ! use video_cards_radeonsi; then + gallium_enable video_cards_radeon r300 r600 radeonsi fi gallium_enable video_cards_freedreno freedreno diff --git a/media-libs/mesa/mesa-17.0.1.ebuild b/media-libs/mesa/mesa-17.0.1.ebuild index 6594ed90ea33..0c6aef9635a7 100644 --- a/media-libs/mesa/mesa-17.0.1.ebuild +++ b/media-libs/mesa/mesa-17.0.1.ebuild @@ -277,8 +277,9 @@ multilib_src_configure() { gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 + ! use video_cards_r600 && \ + ! use video_cards_radeonsi; then + gallium_enable video_cards_radeon r300 r600 radeonsi fi gallium_enable video_cards_freedreno freedreno diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 6ba97de334cc..a67d8058eed7 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -262,8 +262,9 @@ multilib_src_configure() { gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 + ! use video_cards_r600 && \ + ! use video_cards_radeonsi; then + gallium_enable video_cards_radeon r300 r600 radeonsi fi gallium_enable video_cards_freedreno freedreno -- 2.26.2