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

This reverts commit 906eaa04d5b56c1b5c7fb3afa1cf33ec92b40279.

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

diff --git a/media-libs/mesa/mesa-13.0.5.ebuild b/media-libs/mesa/mesa-13.0.5.ebuild
index 7e4026cc545c4dcd86bf3f5d0fb87618ecb957d6..3e047a89eb23fc9c7cb4f5648f050288649854af 100644 (file)
--- a/media-libs/mesa/mesa-13.0.5.ebuild
+++ b/media-libs/mesa/mesa-13.0.5.ebuild
@@ -263,9 +263,8 @@ multilib_src_configure() {
                gallium_enable video_cards_r600 r600
                gallium_enable video_cards_radeonsi radeonsi
                if ! use video_cards_r300 && \
-                               ! use video_cards_r600 && \
-                               ! use video_cards_radeonsi; then
-                       gallium_enable video_cards_radeon r300 r600 radeonsi
+                               ! use video_cards_r600; then
+                       gallium_enable video_cards_radeon r300 r600
                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 0c6aef9635a73bb8cb56768ae9b95bc9fb1e3e65..6594ed90ea33c1fcc43b17d961102197b1a15b38 100644 (file)
--- a/media-libs/mesa/mesa-17.0.1.ebuild
+++ b/media-libs/mesa/mesa-17.0.1.ebuild
@@ -277,9 +277,8 @@ multilib_src_configure() {
                gallium_enable video_cards_r600 r600
                gallium_enable video_cards_radeonsi radeonsi
                if ! use video_cards_r300 && \
-                               ! use video_cards_r600 && \
-                               ! use video_cards_radeonsi; then
-                       gallium_enable video_cards_radeon r300 r600 radeonsi
+                               ! use video_cards_r600; then
+                       gallium_enable video_cards_radeon r300 r600
                fi
 
                gallium_enable video_cards_freedreno freedreno

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a67d8058eed73ea739ba09d6c24963becb53362c..6ba97de334cc08086973e053dc210643692a52cd 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -262,9 +262,8 @@ multilib_src_configure() {
                gallium_enable video_cards_r600 r600
                gallium_enable video_cards_radeonsi radeonsi
                if ! use video_cards_r300 && \
-                               ! use video_cards_r600 && \
-                               ! use video_cards_radeonsi; then
-                       gallium_enable video_cards_radeon r300 r600 radeonsi
+                               ! use video_cards_r600; then
+                       gallium_enable video_cards_radeon r300 r600
                fi
 
                gallium_enable video_cards_freedreno freedreno