[gentoo-dev] [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles

[gentoo-dev] [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles

[Mike Gilbert]

These have not been reviewed for several years and contain many
obsolete/invalid values.

Currently only two packages utilize these flags:

media-sound/alsa-tools optionally installs several card-specific
utilities. It is unlikely that anything will break if these are
uninstalled by accident.

sys-firmware/alsa-firmware installs firmware for niche hardware
and is probably needed by very few users.

It probably makes more sense for the user to set ALSA_CARDS explicitly.

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 profiles/arch/alpha/make.defaults         |   7 +------
 profiles/arch/amd64/make.defaults         |   4 ----
 profiles/arch/ia64/make.defaults          |   6 +-----
 profiles/arch/mips/make.defaults          |   6 +-----
 profiles/arch/powerpc/ppc32/make.defaults |   4 ----
 profiles/arch/x86/make.defaults           |   4 ----
 profiles/desc/.alsa_cards.desc.swp        | Bin 0 -> 12288 bytes
 7 files changed, 3 insertions(+), 28 deletions(-)
 create mode 100644 profiles/desc/.alsa_cards.desc.swp

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 6749b9c0a44..0d2b90931c4 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="alpha"
@@ -23,11 +23,6 @@ LIBDIR_alpha="lib"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
-# Chris Gianelloni <wolf31o2@gentoo.org> (2007-02-05)
-# Defaults for audio drivers. These are copied from x86 (minus modems), since
-# Alpha supports the same busses.
-ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
-
 # Tobias Klausmann <klausman@gentoo.org> (2018-06-25)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 775103c63ac..0c05dec124e 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -50,10 +50,6 @@ ABI_X86="64"
 # Defaults for video drivers
 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
-# Danny van Dyk <kugelfang@gentoo.org> (2006-12-22)
-# Default for ALSA_CARDS USE_EXPAND variable.
-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"
-
 # Michał Górny <mgorny@gentoo.org> (2013-01-26)
 # Unhide the x86-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index c87d017b15e..4327e575707 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ia64"
@@ -27,7 +27,3 @@ CHOST_ia64="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2006-12-23)
-# Defaults for audio drivers - Took from x86 profile
-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"
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
index cb1dead24e7..9d3d5a8a1bf 100644
--- a/profiles/arch/mips/make.defaults
+++ b/profiles/arch/mips/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
@@ -15,7 +15,3 @@ USE="-fortran -openmp"
 LIBDIR_o32="lib"
 LIBDIR_n32="lib32"
 LIBDIR_n64="lib64"
-
-# Matt Turner <mattst88@gentoo.org> (2010-12-06)
-# Probably missing a bunch for various SGI systems.
-ALSA_CARDS="au1x00"
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 0332427d751..51f2ea0ad11 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -17,10 +17,6 @@ FCFLAGS="${CFLAGS}"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
-# Diego Pettenò <flameeyes@gentoo.org> (2006-12-06)
-# Defaults for PowerPC sound driver
-ALSA_CARDS="aoa aoa-fabric-layout aoa-onyx aoa-soundbus aoa-soundbus-i2s aoa-tas aoa-toonie powermac usb-audio via82xx"
-
 # Michał Górny <mgorny@gentoo.org> (2014-06-27)
 # Multilib-related setup for compatibility with future multilib.
 ABI="ppc"
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 4a9685fa276..c1f35ac18d3 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -30,10 +30,6 @@ LIBDIR_x86="lib"
 # Defaults for video drivers
 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
-# Andrej Kacian <ticho@gentoo.org> (2006-12-21)
-# Defaults for audio drivers
-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"
-
 # Michał Górny <mgorny@gentoo.org> (2014-06-25)
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
diff --git a/profiles/desc/.alsa_cards.desc.swp b/profiles/desc/.alsa_cards.desc.swp
new file mode 100644
index 0000000000000000000000000000000000000000..e96a7263d04461d069c3e6ecaf2730efc81dfbde
GIT binary patch
literal 12288
zcmeI2Pj4GV7{;f)@uw8Q5e{#uD%q+X+iT+{5&}84lUj`%H`}!7DH^ZG>!G_l%gk<S
za{zHILLA`2u?LQP0gjwG7XcC<gA+(RvvyLNMpZ98fM%s9GyA^J%+CCFW+W>+uHP99
zX?@LOxZY&!`zvMs^+!Lj$G>f`X{6G05!=jjuY{{uKG(5KezxkcrbVhuEfh(nR4vtN
zDkEWP6JdfHj|@KyxSp6bd;bExI*TLV2)r193#{oi>ehSty-W1=Tl+88%()x^N5Bzq
z1RMcJz!7i+905n*e?cHi&#})jlk=<DTwRstPL-=$S2zNWfFs}tI0BA<Bj5-)0*-(q
z;0QPZj=+DA0G}{6eTA{LS21|}|Nr>+|1TFA`xg2Jx&@7(521IUzu#c&XXr~PhIXL_
zbRPQs0%JcxUqKmk0DS<x3;p#vV~?R9q3@tCpaAMaSD=f~pRY0Y2lNPf2uWxQDnShT
z72|vaJ%nyScHC9SU5<bw;0QPZj({WJ2si>SgTNx5rh%j?-QzKzak@9$y5_ZN*IIQ5
z<@+u6fFFseR!Iie?ObP(piRMp84Y<ZE4Q^u#iy&{DwXaYyUXlo?s*;>^<*eR&11TA
zfB?(QxSE@}x3K+j6CkngR~w#Jv8Cs=h$j<UZF%b`Hff^ek<iS*nhG@PCq^am6Y^D_
zO#C7^N=7HPF@IoPMV2-rZZe^%bGJ{WrdMgV%2a~8%*?pae#VB-GOJ^;VbgoVelh-y
zc7-<Dwe{s+8tv^eSekZv#}@QXP0v~owuUsA&om4t^B;8&uJ5tfB$H|?lY|FAd75b+
zWpX+6(aKWWk{`?C*~Kd1XjAG3GsW|XRAm|>#9}$;+P<NahsE*$5hR}ROW3(EnO03S
z==(l(qDX{V)rPAui})hqcoR=QX=fQ-W$R~V>+HVLVZ&=!G&fMCqCVJVGMUIwNp-5(
zpa|26;mkCXfoNPS`W$re{zW_nJ5-Bcsh=DzyjGdbCMHFD`$n$wI2L-!qlkL`h&q;4
zk&n+d3_HC63uW@`thbBcGIx5;MXt_7oHy1zo9tJI`(*1w8g&OnqFt=BWy03G_!fFI
zHx+8&E`Iv<q|uV!vJvV}daK`W%<XgVL{tx`)DxKEZhuI3gf>zo<>H~pJ#kS9yJ!cS
z=u)Ks5iTkiXq;1L<in1o)C}SN_o8ZUQ}N9<n{a)`O6V=4tL$ki%WRzmrq!O?(RQWQ
zxuG2u$^e70`<AxyVzkutvCr!@6z#^mD7<CSoU?$}8^s>$YQZy1fV!O`vg)I&v}pFq
zbiG$CHUr~E&Qg1v74O>*q(}lm9e*&##kdUYX7EMGsfQlp0EYt=EsyutWx63mN-`s(
zbS5Ti_^_64&!i#yNjn8N2DwZO*-zQEOfvvCq^8u_@jHjz&R);Qk<~x!AB;LTdo+!B
zXo@a+68lY#b970VJx-)-CI}}}Tr{^g+c)=VTO>mBh(`H10;(M>dn|T3@-T|7N*7v&
Zvy8lYy<PPH!us*WJ#AT{0Hl&N_7Bck0X+Z!

literal 0
HcmV?d00001

-- 
2.33.1

[gentoo-dev] Re: [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles

[Mike Gilbert]

On Tue, Oct 26, 2021 at 2:38 PM Mike Gilbert <floppym@gentoo.org> wrote:
> diff --git a/profiles/desc/.alsa_cards.desc.swp b/profiles/desc/.alsa_cards.desc.swp
> new file mode 100644
> index 0000000000000000000000000000000000000000..e96a7263d04461d069c3e6ecaf2730efc81dfbde
> GIT binary patch

Oops, I accidentally committed my vim swap file. I have fixed this locally.

Re: [gentoo-dev] Re: [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles

[Hanno Böck]

On Tue, 26 Oct 2021 14:41:01 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> Oops, I accidentally committed my vim swap file. I have fixed this
> locally.

Should we add *.swp (and a few others like *~, *.bak, *.orig) to
.gitignore to avoid this from happening again?

-- 
Hanno Böck
https://hboeck.de/

Re: [gentoo-dev] Re: [PATCH] profiles: remove default ALSA_CARDS setting from arch profiles

[Matthew Smith]

Hi,

On 28/10/2021 08:55, Hanno Böck wrote:
 > On Tue, 26 Oct 2021 14:41:01 -0400
 > Mike Gilbert <floppym@gentoo.org> wrote:
 >
 >> Oops, I accidentally committed my vim swap file. I have fixed this
 >> locally.
 >
 > Should we add *.swp (and a few others like *~, *.bak, *.orig) to
 > .gitignore to avoid this from happening again?

I think it's best if people put their editor's temporary/backup
files in their local gitignore, instead of trying to maintain a
giant per-repository ignore file that needs amending for every
user's favourite editor.

For example, in ~/.gitconfig:

     [core]
     excludesFile = ~/.gitignore

Then ~/.gitignore can contain:

     *.swp
     *.bak
     *.orig

Thanks,
Matthew