media-libs/mesa: Build radeonsi if only VIDEO_CARDS="radeon" is selected.

Bug: https://bugs.gentoo.org/611928

diff --git a/media-libs/mesa/mesa-13.0.5.ebuild b/media-libs/mesa/mesa-13.0.5.ebuild
index 8aa4db9db5a5bd2f2ce8bfc9849cc638d8f5f896..c4fbbc5b7887e416ccdfa24802e91c49b8922ec3 100644 (file)
--- 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 6594ed90ea33c1fcc43b17d961102197b1a15b38..0c6aef9635a73bb8cb56768ae9b95bc9fb1e3e65 100644 (file)
--- 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 6ba97de334cc08086973e053dc210643692a52cd..a67d8058eed73ea739ba09d6c24963becb53362c 100644 (file)
--- 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