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

diff --git a/media-libs/mesa/mesa-11.0.6.ebuild b/media-libs/mesa/mesa-11.0.6.ebuild
index 744e17b33a101c1afe836740520f68021c101edd..6df5941d2978ae34f96a4b36a1b8b2a09ddfd18c 100644 (file)
--- 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 38d52d0732cd8a7a8e2a45cb48757b53a4f14bc0..a13476d3e367a5927e91f007f232001bf87848d9 100644 (file)
--- 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 9291a2cbfa62d34965804e9b39914f8017fb48c6..0f23b973b6ac5365b17fb918ea2dd8bf4c663986 100644 (file)
--- 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 812c83ac89d2e1d3889ed99216408d12417d2b5e..f26cef504596fe24c3fee6f85c481af07b578c39 100644 (file)
--- 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 )