Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Sat, 19 Dec 2015 04:05:59
Message-Id: 1450497911.e743ca8e17c30b87c7fc9ebadc69279ed03a0081.mattst88@gentoo
1 commit: e743ca8e17c30b87c7fc9ebadc69279ed03a0081
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 19 03:42:06 2015 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 19 04:05:11 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e743ca8e
7
8 media-libs/mesa: Require llvm if using radeon+gallium.
9
10 The R300 driver requires llvm on x86/amd64. Also relax the requirement to be
11 x86/amd64-only for video_cards_r300.
12
13 Bug: https://bugs.gentoo.org/567848
14
15 media-libs/mesa/mesa-11.0.6.ebuild | 5 +++--
16 media-libs/mesa/mesa-11.0.7.ebuild | 5 +++--
17 media-libs/mesa/mesa-11.1.0.ebuild | 5 +++--
18 media-libs/mesa/mesa-9999.ebuild | 5 +++--
19 4 files changed, 12 insertions(+), 8 deletions(-)
20
21 diff --git a/media-libs/mesa/mesa-11.0.6.ebuild b/media-libs/mesa/mesa-11.0.6.ebuild
22 index 744e17b..6df5941 100644
23 --- a/media-libs/mesa/mesa-11.0.6.ebuild
24 +++ b/media-libs/mesa/mesa-11.0.6.ebuild
25 @@ -64,10 +64,11 @@ REQUIRED_USE="
26 video_cards_i965? ( classic )
27 video_cards_ilo? ( gallium )
28 video_cards_nouveau? ( || ( classic gallium ) )
29 - video_cards_radeon? ( || ( classic gallium ) )
30 + video_cards_radeon? ( || ( classic gallium )
31 + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
32 video_cards_r100? ( classic )
33 video_cards_r200? ( classic )
34 - video_cards_r300? ( gallium llvm )
35 + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
36 video_cards_r600? ( gallium )
37 video_cards_radeonsi? ( gallium llvm )
38 video_cards_vmware? ( gallium )
39
40 diff --git a/media-libs/mesa/mesa-11.0.7.ebuild b/media-libs/mesa/mesa-11.0.7.ebuild
41 index 38d52d0..a13476d 100644
42 --- a/media-libs/mesa/mesa-11.0.7.ebuild
43 +++ b/media-libs/mesa/mesa-11.0.7.ebuild
44 @@ -64,10 +64,11 @@ REQUIRED_USE="
45 video_cards_i965? ( classic )
46 video_cards_ilo? ( gallium )
47 video_cards_nouveau? ( || ( classic gallium ) )
48 - video_cards_radeon? ( || ( classic gallium ) )
49 + video_cards_radeon? ( || ( classic gallium )
50 + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
51 video_cards_r100? ( classic )
52 video_cards_r200? ( classic )
53 - video_cards_r300? ( gallium llvm )
54 + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
55 video_cards_r600? ( gallium )
56 video_cards_radeonsi? ( gallium llvm )
57 video_cards_vmware? ( gallium )
58
59 diff --git a/media-libs/mesa/mesa-11.1.0.ebuild b/media-libs/mesa/mesa-11.1.0.ebuild
60 index 9291a2c..0f23b97 100644
61 --- a/media-libs/mesa/mesa-11.1.0.ebuild
62 +++ b/media-libs/mesa/mesa-11.1.0.ebuild
63 @@ -64,10 +64,11 @@ REQUIRED_USE="
64 video_cards_i965? ( classic )
65 video_cards_ilo? ( gallium )
66 video_cards_nouveau? ( || ( classic gallium ) )
67 - video_cards_radeon? ( || ( classic gallium ) )
68 + video_cards_radeon? ( || ( classic gallium )
69 + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
70 video_cards_r100? ( classic )
71 video_cards_r200? ( classic )
72 - video_cards_r300? ( gallium llvm )
73 + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
74 video_cards_r600? ( gallium )
75 video_cards_radeonsi? ( gallium llvm )
76 video_cards_vmware? ( gallium )
77
78 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
79 index 812c83a..f26cef5 100644
80 --- a/media-libs/mesa/mesa-9999.ebuild
81 +++ b/media-libs/mesa/mesa-9999.ebuild
82 @@ -64,10 +64,11 @@ REQUIRED_USE="
83 video_cards_i965? ( classic )
84 video_cards_ilo? ( gallium )
85 video_cards_nouveau? ( || ( classic gallium ) )
86 - video_cards_radeon? ( || ( classic gallium ) )
87 + video_cards_radeon? ( || ( classic gallium )
88 + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
89 video_cards_r100? ( classic )
90 video_cards_r200? ( classic )
91 - video_cards_r300? ( gallium llvm )
92 + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
93 video_cards_r600? ( gallium )
94 video_cards_radeonsi? ( gallium llvm )
95 video_cards_vmware? ( gallium )