Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles
Date: Tue, 26 Oct 2021 18:38:26
Message-Id: 20211026183802.3792186-1-floppym@gentoo.org
1 These have not been reviewed for several years and contain many
2 obsolete/invalid values.
3
4 Currently only two packages utilize these flags:
5
6 media-sound/alsa-tools optionally installs several card-specific
7 utilities. It is unlikely that anything will break if these are
8 uninstalled by accident.
9
10 sys-firmware/alsa-firmware installs firmware for niche hardware
11 and is probably needed by very few users.
12
13 It probably makes more sense for the user to set ALSA_CARDS explicitly.
14
15 Signed-off-by: Mike Gilbert <floppym@g.o>
16 ---
17 profiles/arch/alpha/make.defaults | 7 +------
18 profiles/arch/amd64/make.defaults | 4 ----
19 profiles/arch/ia64/make.defaults | 6 +-----
20 profiles/arch/mips/make.defaults | 6 +-----
21 profiles/arch/powerpc/ppc32/make.defaults | 4 ----
22 profiles/arch/x86/make.defaults | 4 ----
23 profiles/desc/.alsa_cards.desc.swp | Bin 0 -> 12288 bytes
24 7 files changed, 3 insertions(+), 28 deletions(-)
25 create mode 100644 profiles/desc/.alsa_cards.desc.swp
26
27 diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
28 index 6749b9c0a44..0d2b90931c4 100644
29 --- a/profiles/arch/alpha/make.defaults
30 +++ b/profiles/arch/alpha/make.defaults
31 @@ -1,4 +1,4 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 +# Copyright 1999-2021 Gentoo Authors
34 # Distributed under the terms of the GNU General Public License v2
35
36 ARCH="alpha"
37 @@ -23,11 +23,6 @@ LIBDIR_alpha="lib"
38 # Defaults for video drivers
39 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
40
41 -# Chris Gianelloni <wolf31o2@g.o> (2007-02-05)
42 -# Defaults for audio drivers. These are copied from x86 (minus modems), since
43 -# Alpha supports the same busses.
44 -ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
45 -
46 # Tobias Klausmann <klausman@g.o> (2018-06-25)
47 # Enable USE=libtirpc by default, to ease dependency resolution during
48 # the stabilization of glibc-2.26. Bug 657148
49 diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
50 index 775103c63ac..0c05dec124e 100644
51 --- a/profiles/arch/amd64/make.defaults
52 +++ b/profiles/arch/amd64/make.defaults
53 @@ -50,10 +50,6 @@ ABI_X86="64"
54 # Defaults for video drivers
55 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
56
57 -# Danny van Dyk <kugelfang@g.o> (2006-12-22)
58 -# Default for ALSA_CARDS USE_EXPAND variable.
59 -ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
60 -
61 # Michał Górny <mgorny@g.o> (2013-01-26)
62 # Unhide the x86-specific USE_EXPANDs.
63 USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
64 diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
65 index c87d017b15e..4327e575707 100644
66 --- a/profiles/arch/ia64/make.defaults
67 +++ b/profiles/arch/ia64/make.defaults
68 @@ -1,4 +1,4 @@
69 -# Copyright 1999-2020 Gentoo Authors
70 +# Copyright 1999-2021 Gentoo Authors
71 # Distributed under the terms of the GNU General Public License v2
72
73 ARCH="ia64"
74 @@ -27,7 +27,3 @@ CHOST_ia64="${CHOST}"
75 # Donnie Berkholz <dberkholz@g.o> (2006-08-18)
76 # Defaults for video drivers
77 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
78 -
79 -# Diego Pettenò <flameeyes@g.o> (2006-12-23)
80 -# Defaults for audio drivers - Took from x86 profile
81 -ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
82 diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
83 index cb1dead24e7..9d3d5a8a1bf 100644
84 --- a/profiles/arch/mips/make.defaults
85 +++ b/profiles/arch/mips/make.defaults
86 @@ -1,4 +1,4 @@
87 -# Copyright 2008-2019 Gentoo Authors
88 +# Copyright 2008-2021 Gentoo Authors
89 # Distributed under the terms of the GNU General Public License v2
90
91 # Donnie Berkholz <dberkholz@g.o> (2006-08-18)
92 @@ -15,7 +15,3 @@ USE="-fortran -openmp"
93 LIBDIR_o32="lib"
94 LIBDIR_n32="lib32"
95 LIBDIR_n64="lib64"
96 -
97 -# Matt Turner <mattst88@g.o> (2010-12-06)
98 -# Probably missing a bunch for various SGI systems.
99 -ALSA_CARDS="au1x00"
100 diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
101 index 0332427d751..51f2ea0ad11 100644
102 --- a/profiles/arch/powerpc/ppc32/make.defaults
103 +++ b/profiles/arch/powerpc/ppc32/make.defaults
104 @@ -17,10 +17,6 @@ FCFLAGS="${CFLAGS}"
105 # Defaults for video drivers
106 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
107
108 -# Diego Pettenò <flameeyes@g.o> (2006-12-06)
109 -# Defaults for PowerPC sound driver
110 -ALSA_CARDS="aoa aoa-fabric-layout aoa-onyx aoa-soundbus aoa-soundbus-i2s aoa-tas aoa-toonie powermac usb-audio via82xx"
111 -
112 # Michał Górny <mgorny@g.o> (2014-06-27)
113 # Multilib-related setup for compatibility with future multilib.
114 ABI="ppc"
115 diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
116 index 4a9685fa276..c1f35ac18d3 100644
117 --- a/profiles/arch/x86/make.defaults
118 +++ b/profiles/arch/x86/make.defaults
119 @@ -30,10 +30,6 @@ LIBDIR_x86="lib"
120 # Defaults for video drivers
121 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
122
123 -# Andrej Kacian <ticho@g.o> (2006-12-21)
124 -# Defaults for audio drivers
125 -ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
126 -
127 # Michał Górny <mgorny@g.o> (2014-06-25)
128 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
129 # by non-multilib ebuilds when non-native ABIs are disabled.
130 diff --git a/profiles/desc/.alsa_cards.desc.swp b/profiles/desc/.alsa_cards.desc.swp
131 new file mode 100644
132 index 0000000000000000000000000000000000000000..e96a7263d04461d069c3e6ecaf2730efc81dfbde
133 GIT binary patch
134 literal 12288
135 zcmeI2Pj4GV7{;f)@uw8Q5e{#uD%q+X+iT+{5&}84lUj`%H`}!7DH^ZG>!G_l%gk<S
136 za{zHILLA`2u?LQP0gjwG7XcC<gA+(RvvyLNMpZ98fM%s9GyA^J%+CCFW+W>+uHP99
137 zX?@LOxZY&!`zvMs^+!Lj$G>f`X{6G05!=jjuY{{uKG(5KezxkcrbVhuEfh(nR4vtN
138 zDkEWP6JdfHj|@KyxSp6bd;bExI*TLV2)r193#{oi>ehSty-W1=Tl+88%()x^N5Bzq
139 z1RMcJz!7i+905n*e?cHi&#})jlk=<DTwRstPL-=$S2zNWfFs}tI0BA<Bj5-)0*-(q
140 z;0QPZj=+DA0G}{6eTA{LS21|}|Nr>+|1TFA`xg2Jx&@7(521IUzu#c&XXr~PhIXL_
141 zbRPQs0%JcxUqKmk0DS<x3;p#vV~?R9q3@tCpaAMaSD=f~pRY0Y2lNPf2uWxQDnShT
142 z72|vaJ%nyScHC9SU5<bw;0QPZj({WJ2si>SgTNx5rh%j?-QzKzak@9$y5_ZN*IIQ5
143 z<@+u6fFFseR!Iie?ObP(piRMp84Y<ZE4Q^u#iy&{DwXaYyUXlo?s*;>^<*eR&11TA
144 zfB?(QxSE@}x3K+j6CkngR~w#Jv8Cs=h$j<UZF%b`Hff^ek<iS*nhG@PCq^am6Y^D_
145 zO#C7^N=7HPF@IoPMV2-rZZe^%bGJ{WrdMgV%2a~8%*?pae#VB-GOJ^;VbgoVelh-y
146 zc7-<Dwe{s+8tv^eSekZv#}@QXP0v~owuUsA&om4t^B;8&uJ5tfB$H|?lY|FAd75b+
147 zWpX+6(aKWWk{`?C*~Kd1XjAG3GsW|XRAm|>#9}$;+P<NahsE*$5hR}ROW3(EnO03S
148 z==(l(qDX{V)rPAui})hqcoR=QX=fQ-W$R~V>+HVLVZ&=!G&fMCqCVJVGMUIwNp-5(
149 zpa|26;mkCXfoNPS`W$re{zW_nJ5-Bcsh=DzyjGdbCMHFD`$n$wI2L-!qlkL`h&q;4
150 zk&n+d3_HC63uW@`thbBcGIx5;MXt_7oHy1zo9tJI`(*1w8g&OnqFt=BWy03G_!fFI
151 zHx+8&E`Iv<q|uV!vJvV}daK`W%<XgVL{tx`)DxKEZhuI3gf>zo<>H~pJ#kS9yJ!cS
152 z=u)Ks5iTkiXq;1L<in1o)C}SN_o8ZUQ}N9<n{a)`O6V=4tL$ki%WRzmrq!O?(RQWQ
153 zxuG2u$^e70`<AxyVzkutvCr!@6z#^mD7<CSoU?$}8^s>$YQZy1fV!O`vg)I&v}pFq
154 zbiG$CHUr~E&Qg1v74O>*q(}lm9e*&##kdUYX7EMGsfQlp0EYt=EsyutWx63mN-`s(
155 zbS5Ti_^_64&!i#yNjn8N2DwZO*-zQEOfvvCq^8u_@jHjz&R);Qk<~x!AB;LTdo+!B
156 zXo@a+68lY#b970VJx-)-CI}}}Tr{^g+c)=VTO>mBh(`H10;(M>dn|T3@-T|7N*7v&
157 Zvy8lYy<PPH!us*WJ#AT{0Hl&N_7Bck0X+Z!
158
159 literal 0
160 HcmV?d00001
161
162 --
163 2.33.1

Replies