From: Matt Turner Date: Sat, 11 Mar 2017 16:22:49 +0000 (-0800) Subject: Revert "media-libs/mesa: Build radeonsi if only VIDEO_CARDS="radeon" is selected." X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ba3c9d7e2e751bf3b6d54c0877fb3b1fe218d9a4;p=gentoo.git 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 7e4026cc545c..3e047a89eb23 100644 --- 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 0c6aef9635a7..6594ed90ea33 100644 --- 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 a67d8058eed7..6ba97de334cc 100644 --- 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