| 1 |
commit: 2f066bcd56649219973cdcde038668935583bb37 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 24 02:17:08 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 24 05:04:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f066bcd |
| 7 |
|
| 8 |
profiles: Simplify video_cards_{i915,i965,intel} masks |
| 9 |
|
| 10 |
Instead of masking them on all the platforms they're not available, |
| 11 |
unmask them on the only two platforms they are. |
| 12 |
|
| 13 |
profiles/arch/alpha/use.mask | 3 --- |
| 14 |
profiles/arch/amd64/use.mask | 3 +++ |
| 15 |
profiles/arch/arm/use.mask | 3 --- |
| 16 |
profiles/arch/arm64/use.mask | 3 --- |
| 17 |
profiles/arch/base/use.mask | 3 +++ |
| 18 |
profiles/arch/hppa/use.mask | 3 --- |
| 19 |
profiles/arch/ia64/use.mask | 6 ------ |
| 20 |
profiles/arch/mips/use.mask | 3 --- |
| 21 |
profiles/arch/nios2/use.mask | 3 --- |
| 22 |
profiles/arch/powerpc/use.mask | 3 --- |
| 23 |
profiles/arch/s390/use.mask | 3 --- |
| 24 |
profiles/arch/sh/use.mask | 3 --- |
| 25 |
profiles/arch/sparc/use.mask | 3 --- |
| 26 |
profiles/arch/x86/use.mask | 3 +++ |
| 27 |
profiles/hardened/linux/powerpc/ppc64/use.mask | 1 - |
| 28 |
15 files changed, 9 insertions(+), 37 deletions(-) |
| 29 |
|
| 30 |
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask |
| 31 |
index df5a829c20c..675246043fa 100644 |
| 32 |
--- a/profiles/arch/alpha/use.mask |
| 33 |
+++ b/profiles/arch/alpha/use.mask |
| 34 |
@@ -131,7 +131,6 @@ video_cards_ast |
| 35 |
video_cards_chips |
| 36 |
video_cards_i128 |
| 37 |
video_cards_i740 |
| 38 |
-video_cards_intel |
| 39 |
video_cards_neomagic |
| 40 |
video_cards_siliconmotion |
| 41 |
video_cards_sis |
| 42 |
@@ -141,8 +140,6 @@ video_cards_vesa |
| 43 |
|
| 44 |
# Matt Turner <mattst88@g.o> |
| 45 |
# Mask more VIDEO_CARDs added with mesa-8.0 |
| 46 |
-video_cards_i915 |
| 47 |
-video_cards_i965 |
| 48 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 49 |
video_cards_vmware |
| 50 |
# llvm is not keyworded |
| 51 |
|
| 52 |
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask |
| 53 |
index f3ec77864a3..f04f03d0d39 100644 |
| 54 |
--- a/profiles/arch/amd64/use.mask |
| 55 |
+++ b/profiles/arch/amd64/use.mask |
| 56 |
@@ -118,6 +118,9 @@ |
| 57 |
-input_devices_synaptics |
| 58 |
-input_devices_vmmouse |
| 59 |
-input_devices_wacom |
| 60 |
+-video_cards_i915 |
| 61 |
+-video_cards_i965 |
| 62 |
+-video_cards_intel |
| 63 |
-video_cards_nvidia |
| 64 |
-video_cards_via |
| 65 |
-video_cards_virtualbox |
| 66 |
|
| 67 |
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask |
| 68 |
index a6e084acb4a..cad602bc98e 100644 |
| 69 |
--- a/profiles/arch/arm/use.mask |
| 70 |
+++ b/profiles/arch/arm/use.mask |
| 71 |
@@ -118,7 +118,6 @@ video_cards_chips |
| 72 |
video_cards_glint |
| 73 |
video_cards_i128 |
| 74 |
video_cards_i740 |
| 75 |
-video_cards_intel |
| 76 |
video_cards_mach64 |
| 77 |
video_cards_mga |
| 78 |
video_cards_neomagic |
| 79 |
@@ -148,8 +147,6 @@ video_cards_r200 |
| 80 |
video_cards_r300 |
| 81 |
video_cards_r600 |
| 82 |
video_cards_radeonsi |
| 83 |
-video_cards_i915 |
| 84 |
-video_cards_i965 |
| 85 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 86 |
video_cards_vmware |
| 87 |
|
| 88 |
|
| 89 |
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask |
| 90 |
index 93d1dcb4b2f..d406d11879b 100644 |
| 91 |
--- a/profiles/arch/arm64/use.mask |
| 92 |
+++ b/profiles/arch/arm64/use.mask |
| 93 |
@@ -199,7 +199,6 @@ video_cards_chips |
| 94 |
video_cards_glint |
| 95 |
video_cards_i128 |
| 96 |
video_cards_i740 |
| 97 |
-video_cards_intel |
| 98 |
video_cards_mach64 |
| 99 |
video_cards_mga |
| 100 |
video_cards_neomagic |
| 101 |
@@ -228,8 +227,6 @@ video_cards_r200 |
| 102 |
video_cards_r300 |
| 103 |
video_cards_r600 |
| 104 |
video_cards_radeonsi |
| 105 |
-video_cards_i915 |
| 106 |
-video_cards_i965 |
| 107 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 108 |
video_cards_vmware |
| 109 |
|
| 110 |
|
| 111 |
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask |
| 112 |
index 0b6f0124e88..2c08a0e989c 100644 |
| 113 |
--- a/profiles/arch/base/use.mask |
| 114 |
+++ b/profiles/arch/base/use.mask |
| 115 |
@@ -136,6 +136,9 @@ video_cards_newport |
| 116 |
|
| 117 |
# not needed on non-x86, non-amd64 systems |
| 118 |
input_devices_vmmouse |
| 119 |
+video_cards_i915 |
| 120 |
+video_cards_i965 |
| 121 |
+video_cards_intel |
| 122 |
video_cards_nvidia |
| 123 |
video_cards_via |
| 124 |
video_cards_vmware |
| 125 |
|
| 126 |
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask |
| 127 |
index 24baf0c5ab9..f0164b9ec48 100644 |
| 128 |
--- a/profiles/arch/hppa/use.mask |
| 129 |
+++ b/profiles/arch/hppa/use.mask |
| 130 |
@@ -218,9 +218,6 @@ video_cards_cirrus |
| 131 |
video_cards_glint |
| 132 |
video_cards_i128 |
| 133 |
video_cards_i740 |
| 134 |
-video_cards_i915 |
| 135 |
-video_cards_i965 |
| 136 |
-video_cards_intel |
| 137 |
video_cards_mach64 |
| 138 |
video_cards_mga |
| 139 |
video_cards_neomagic |
| 140 |
|
| 141 |
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask |
| 142 |
index a5141ca05f2..5cbc0158573 100644 |
| 143 |
--- a/profiles/arch/ia64/use.mask |
| 144 |
+++ b/profiles/arch/ia64/use.mask |
| 145 |
@@ -147,14 +147,8 @@ video_cards_ast |
| 146 |
video_cards_siliconmotion |
| 147 |
video_cards_sis |
| 148 |
|
| 149 |
-# Matt Turner <mattst88@g.o> (02 Jan 2013) |
| 150 |
-# Not available on ia64. See bugs 449816, 448606. |
| 151 |
-video_cards_intel |
| 152 |
- |
| 153 |
# Matt Turner <mattst88@g.o> |
| 154 |
# Mask more VIDEO_CARDs added with mesa-8.0 |
| 155 |
-video_cards_i915 |
| 156 |
-video_cards_i965 |
| 157 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 158 |
video_cards_vmware |
| 159 |
# llvm is not keyworded |
| 160 |
|
| 161 |
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask |
| 162 |
index 53d2b1f6f8b..e19450970ae 100644 |
| 163 |
--- a/profiles/arch/mips/use.mask |
| 164 |
+++ b/profiles/arch/mips/use.mask |
| 165 |
@@ -159,8 +159,6 @@ video_cards_r200 |
| 166 |
video_cards_r300 |
| 167 |
video_cards_r600 |
| 168 |
video_cards_radeonsi |
| 169 |
-video_cards_i915 |
| 170 |
-video_cards_i965 |
| 171 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 172 |
video_cards_vmware |
| 173 |
|
| 174 |
@@ -170,7 +168,6 @@ video_cards_apm |
| 175 |
video_cards_ark |
| 176 |
video_cards_i128 |
| 177 |
video_cards_i740 |
| 178 |
-video_cards_intel |
| 179 |
video_cards_neomagic |
| 180 |
video_cards_rendition |
| 181 |
video_cards_tga |
| 182 |
|
| 183 |
diff --git a/profiles/arch/nios2/use.mask b/profiles/arch/nios2/use.mask |
| 184 |
index d063f2e446a..2397a963421 100644 |
| 185 |
--- a/profiles/arch/nios2/use.mask |
| 186 |
+++ b/profiles/arch/nios2/use.mask |
| 187 |
@@ -143,7 +143,6 @@ video_cards_chips |
| 188 |
video_cards_glint |
| 189 |
video_cards_i128 |
| 190 |
video_cards_i740 |
| 191 |
-video_cards_intel |
| 192 |
video_cards_mach64 |
| 193 |
video_cards_mga |
| 194 |
video_cards_neomagic |
| 195 |
@@ -173,8 +172,6 @@ video_cards_r200 |
| 196 |
video_cards_r300 |
| 197 |
video_cards_r600 |
| 198 |
video_cards_radeonsi |
| 199 |
-video_cards_i915 |
| 200 |
-video_cards_i965 |
| 201 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 202 |
video_cards_vmware |
| 203 |
|
| 204 |
|
| 205 |
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask |
| 206 |
index 60ef03a5a1d..9718f9d7ea1 100644 |
| 207 |
--- a/profiles/arch/powerpc/use.mask |
| 208 |
+++ b/profiles/arch/powerpc/use.mask |
| 209 |
@@ -116,7 +116,6 @@ video_cards_ark |
| 210 |
video_cards_ast |
| 211 |
video_cards_i128 |
| 212 |
video_cards_i740 |
| 213 |
-video_cards_intel |
| 214 |
video_cards_neomagic |
| 215 |
video_cards_rendition |
| 216 |
video_cards_siliconmotion |
| 217 |
@@ -127,8 +126,6 @@ video_cards_vesa |
| 218 |
|
| 219 |
# Matt Turner <mattst88@g.o> |
| 220 |
# Mask more VIDEO_CARDs added with mesa-8.0 |
| 221 |
-video_cards_i915 |
| 222 |
-video_cards_i965 |
| 223 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 224 |
video_cards_vmware |
| 225 |
|
| 226 |
|
| 227 |
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask |
| 228 |
index dbedb8e62b6..1a5e0bf76ed 100644 |
| 229 |
--- a/profiles/arch/s390/use.mask |
| 230 |
+++ b/profiles/arch/s390/use.mask |
| 231 |
@@ -110,9 +110,6 @@ video_cards_geode |
| 232 |
video_cards_glint |
| 233 |
video_cards_i128 |
| 234 |
video_cards_i740 |
| 235 |
-video_cards_i915 |
| 236 |
-video_cards_i965 |
| 237 |
-video_cards_intel |
| 238 |
video_cards_mach64 |
| 239 |
video_cards_mga |
| 240 |
video_cards_modesetting |
| 241 |
|
| 242 |
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask |
| 243 |
index ecf61cc230d..7fce0522abf 100644 |
| 244 |
--- a/profiles/arch/sh/use.mask |
| 245 |
+++ b/profiles/arch/sh/use.mask |
| 246 |
@@ -92,7 +92,6 @@ video_cards_chips |
| 247 |
video_cards_glint |
| 248 |
video_cards_i128 |
| 249 |
video_cards_i740 |
| 250 |
-video_cards_intel |
| 251 |
video_cards_mach64 |
| 252 |
video_cards_mga |
| 253 |
video_cards_neomagic |
| 254 |
@@ -122,8 +121,6 @@ video_cards_r200 |
| 255 |
video_cards_r300 |
| 256 |
video_cards_r600 |
| 257 |
video_cards_radeonsi |
| 258 |
-video_cards_i915 |
| 259 |
-video_cards_i965 |
| 260 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 261 |
video_cards_vmware |
| 262 |
|
| 263 |
|
| 264 |
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask |
| 265 |
index b1d68d441bc..516559e0a0e 100644 |
| 266 |
--- a/profiles/arch/sparc/use.mask |
| 267 |
+++ b/profiles/arch/sparc/use.mask |
| 268 |
@@ -216,7 +216,6 @@ video_cards_ark |
| 269 |
video_cards_rendition |
| 270 |
video_cards_chips |
| 271 |
video_cards_apm |
| 272 |
-video_cards_intel |
| 273 |
video_cards_nv |
| 274 |
video_cards_vesa |
| 275 |
video_cards_ast |
| 276 |
@@ -224,8 +223,6 @@ video_cards_nouveau |
| 277 |
|
| 278 |
# Matt Turner <mattst88@g.o> |
| 279 |
# Mask more VIDEO_CARDs added with mesa-8.0 |
| 280 |
-video_cards_i915 |
| 281 |
-video_cards_i965 |
| 282 |
# vmware wasn't added with mesa-8.0, but it should still be masked |
| 283 |
video_cards_vmware |
| 284 |
# llvm is not keyworded |
| 285 |
|
| 286 |
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask |
| 287 |
index 933a22bc1de..3ababee80a5 100644 |
| 288 |
--- a/profiles/arch/x86/use.mask |
| 289 |
+++ b/profiles/arch/x86/use.mask |
| 290 |
@@ -136,6 +136,9 @@ |
| 291 |
-input_devices_synaptics |
| 292 |
-input_devices_vmmouse |
| 293 |
-input_devices_wacom |
| 294 |
+-video_cards_i915 |
| 295 |
+-video_cards_i965 |
| 296 |
+-video_cards_intel |
| 297 |
-video_cards_nvidia |
| 298 |
-video_cards_vmware |
| 299 |
-video_cards_geode |
| 300 |
|
| 301 |
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask |
| 302 |
index a487f3164d2..194eec99ed4 100644 |
| 303 |
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask |
| 304 |
+++ b/profiles/hardened/linux/powerpc/ppc64/use.mask |
| 305 |
@@ -26,7 +26,6 @@ video_cards_apm |
| 306 |
video_cards_ark |
| 307 |
video_cards_i128 |
| 308 |
video_cards_i740 |
| 309 |
-video_cards_intel |
| 310 |
video_cards_neomagic |
| 311 |
video_cards_rendition |
| 312 |
video_cards_siliconmotion |
Archives