commit:     e743ca8e17c30b87c7fc9ebadc69279ed03a0081
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 03:42:06 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 04:05:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e743ca8e

media-libs/mesa: Require llvm if using radeon+gallium.

The R300 driver requires llvm on x86/amd64. Also relax the requirement to be
x86/amd64-only for video_cards_r300.

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

 media-libs/mesa/mesa-11.0.6.ebuild | 5 +++--
 media-libs/mesa/mesa-11.0.7.ebuild | 5 +++--
 media-libs/mesa/mesa-11.1.0.ebuild | 5 +++--
 media-libs/mesa/mesa-9999.ebuild   | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/mesa-11.0.6.ebuild 
b/media-libs/mesa/mesa-11.0.6.ebuild
index 744e17b..6df5941 100644
--- a/media-libs/mesa/mesa-11.0.6.ebuild
+++ b/media-libs/mesa/mesa-11.0.6.ebuild
@@ -64,10 +64,11 @@ REQUIRED_USE="
        video_cards_i965?   ( classic )
        video_cards_ilo?    ( gallium )
        video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_radeon? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
        video_cards_r100?   ( classic )
        video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium llvm )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
        video_cards_r600?   ( gallium )
        video_cards_radeonsi?   ( gallium llvm )
        video_cards_vmware? ( gallium )

diff --git a/media-libs/mesa/mesa-11.0.7.ebuild 
b/media-libs/mesa/mesa-11.0.7.ebuild
index 38d52d0..a13476d 100644
--- a/media-libs/mesa/mesa-11.0.7.ebuild
+++ b/media-libs/mesa/mesa-11.0.7.ebuild
@@ -64,10 +64,11 @@ REQUIRED_USE="
        video_cards_i965?   ( classic )
        video_cards_ilo?    ( gallium )
        video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_radeon? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
        video_cards_r100?   ( classic )
        video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium llvm )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
        video_cards_r600?   ( gallium )
        video_cards_radeonsi?   ( gallium llvm )
        video_cards_vmware? ( gallium )

diff --git a/media-libs/mesa/mesa-11.1.0.ebuild 
b/media-libs/mesa/mesa-11.1.0.ebuild
index 9291a2c..0f23b97 100644
--- a/media-libs/mesa/mesa-11.1.0.ebuild
+++ b/media-libs/mesa/mesa-11.1.0.ebuild
@@ -64,10 +64,11 @@ REQUIRED_USE="
        video_cards_i965?   ( classic )
        video_cards_ilo?    ( gallium )
        video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_radeon? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
        video_cards_r100?   ( classic )
        video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium llvm )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
        video_cards_r600?   ( gallium )
        video_cards_radeonsi?   ( gallium llvm )
        video_cards_vmware? ( gallium )

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 812c83a..f26cef5 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -64,10 +64,11 @@ REQUIRED_USE="
        video_cards_i965?   ( classic )
        video_cards_ilo?    ( gallium )
        video_cards_nouveau? ( || ( classic gallium ) )
-       video_cards_radeon? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
        video_cards_r100?   ( classic )
        video_cards_r200?   ( classic )
-       video_cards_r300?   ( gallium llvm )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
        video_cards_r600?   ( gallium )
        video_cards_radeonsi?   ( gallium llvm )
        video_cards_vmware? ( gallium )

Reply via email to