From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH] alsa: Update to version 1.2.5.1 Date: Wed, 07 Jul 2021 23:36:37 +0200 Message-ID: In-Reply-To: <03eedfc6-34a9-7610-3791-c50d5644fec7@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7108044255570042116==" List-Id: --===============7108044255570042116== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Arne, Having looked further at this I don't think there is a problem with the origi= nal patch I created or I am misunderstanding something and need more help to = understand what the problem is. The original rootfile had the etc/rc.d/init.d/alsa near the end of the rootfi= le. The latest version build creates this file in the rootfile at the top of = the rootfile as the first line. So the rootfile patch has the original etc/rc.d/init.s/alsa line with a - in = front of it and has the etc/rc.d/init.d/alsa line at the top of the rootfile with a + in fron= t of it. So I believe the patch has just moved the etc/rc.d/init.d/alsa line from late= r in the rootfile list to at the top of the rootfile list. So the line is pre= sent which checking the directories in the build directory I find that the in= itscript is in etc/rc.d/init.d If I have misunderstood what the problem is please let me know. Regards, Adolf. On 06/07/2021 15:44, Adolf Belka wrote: > Hi Arne, > > I just had a look at the rootfile that was submitted and the first line in = it is that initscript with a + against the line. > > Then the last line in the rootfile patch has the same initscript but with a= - against the line. > > So not really sure what is going on here but will do a v2 version and look = closely at the rootfile before I create the patch. > > Regards, > > Adolf. > > On 06/07/2021 15:33, Adolf Belka wrote: >> Hi Arne, >> >> On 06/07/2021 14:33, Arne Fitzenreiter wrote: >>> Hi Adolf, >>> >>> Please readd >>> >>> etc/rc.d/init.d/alsa >>> >>> to the alsa rootfile. The initskript is copied earlier by the initskripts= lfs but excluded for the cdrom >>> and should shipped with the alsa addon. >> >> Whoops. Sorry for the the error. Thanks for spotting it. >> >> I will provide an v2 version patch with that file added back in. >> >> Regards, >> Adolf. >>> >>> thx Arne >>> >>> >>> Am 2021-06-30 19:46, schrieb Adolf Belka: >>>> - Not really sure if a sound support capability is really appropriate >>>> for a firewall. I >>>> =C2=A0=C2=A0 wouldn't have it. However if it stays as an add-on then it = should >>>> be up to date. >>>> - Update alsa-lib from 1.0.27.1 (2013) to 1.2.5.1 (2021) >>>> - Update alsa-utils from 1.0.27.1 (2013) to 1.2.5.1 (2021) >>>> - Update alsa-firmware from 1.0.27 (2013) to 1.2.4 (2020) >>>> - Update rootfile >>>> - Changelog is too large to include here. Changes back to 2019-11-20 >>>> can be found at >>>> =C2=A0=C2=A0 https://www.alsa-project.org/wiki/Main_Page >>>> =C2=A0=C2=A0 Earlier changes have to be found from the git commits at >>>> =C2=A0=C2=A0 https://github.com/alsa-project/alsa-lib and >>>> =C2=A0=C2=A0 https://github.com/alsa-project/alsa-utils >>>> =C2=A0=C2=A0 There is no changelog or git commits that I have been able = to find >>>> for alsa-firmware >>>> >>>> Signed-off-by: Adolf Belka >>>> --- >>>> =C2=A0config/rootfiles/packages/alsa | 118 ++++++++++++++---------------= ---- >>>> =C2=A0lfs/alsa=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0 14 ++-- >>>> =C2=A02 files changed, 58 insertions(+), 74 deletions(-) >>>> >>>> diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/= alsa >>>> index 1c0d744ab..a704727ec 100644 >>>> --- a/config/rootfiles/packages/alsa >>>> +++ b/config/rootfiles/packages/alsa >>>> @@ -1,6 +1,6 @@ >>>> +etc/rc.d/init.d/alsa >>>> =C2=A0lib/firmware/aica_firmware.bin >>>> =C2=A0#lib/firmware/asihpi >>>> -lib/firmware/asihpi/dsp2400.bin >>>> =C2=A0lib/firmware/asihpi/dsp5000.bin >>>> =C2=A0lib/firmware/asihpi/dsp6200.bin >>>> =C2=A0lib/firmware/asihpi/dsp6205.bin >>>> @@ -8,8 +8,15 @@ lib/firmware/asihpi/dsp6400.bin >>>> =C2=A0lib/firmware/asihpi/dsp6600.bin >>>> =C2=A0lib/firmware/asihpi/dsp8700.bin >>>> =C2=A0lib/firmware/asihpi/dsp8900.bin >>>> -lib/firmware/ctefx.bin >>>> -lib/firmware/ctspeq.bin >>>> +#lib/firmware/cs46xx >>>> +lib/firmware/cs46xx/ba1 >>>> +lib/firmware/cs46xx/cwc4630 >>>> +lib/firmware/cs46xx/cwcasync >>>> +lib/firmware/cs46xx/cwcbinhack >>>> +lib/firmware/cs46xx/cwcdma >>>> +lib/firmware/cs46xx/cwcsnoop >>>> +lib/firmware/ctefx-desktop.bin >>>> +lib/firmware/ctefx-r3di.bin >>>> =C2=A0lib/firmware/digiface_firmware.bin >>>> =C2=A0lib/firmware/digiface_firmware_rev11.bin >>>> =C2=A0#lib/firmware/ea >>>> @@ -98,9 +105,12 @@ lib/firmware/vx/x1_1_vp4.xlx >>>> =C2=A0lib/firmware/vx/x1_1_vx2.xlx >>>> =C2=A0lib/firmware/vx/x1_1_vxp.xlx >>>> =C2=A0lib/firmware/vx/x1_2_v22.xlx >>>> +#lib/udev/rules.d/90-alsa-restore.rules >>>> =C2=A0usr/bin/aconnect >>>> +usr/bin/alsabat >>>> =C2=A0usr/bin/alsaloop >>>> =C2=A0usr/bin/alsamixer >>>> +usr/bin/alsatplg >>>> =C2=A0usr/bin/alsaucm >>>> =C2=A0usr/bin/amidi >>>> =C2=A0usr/bin/amixer >>>> @@ -111,19 +121,19 @@ usr/bin/arecordmidi >>>> =C2=A0usr/bin/aseqdump >>>> =C2=A0usr/bin/aseqnet >>>> =C2=A0usr/bin/aserver >>>> +usr/bin/axfer >>>> =C2=A0usr/bin/iecset >>>> =C2=A0usr/bin/speaker-test >>>> =C2=A0#usr/include/alsa >>>> -#usr/include/alsa/alisp.h >>>> =C2=A0#usr/include/alsa/asoundef.h >>>> =C2=A0#usr/include/alsa/asoundlib.h >>>> =C2=A0#usr/include/alsa/conf.h >>>> =C2=A0#usr/include/alsa/control.h >>>> =C2=A0#usr/include/alsa/control_external.h >>>> +#usr/include/alsa/control_plugin.h >>>> =C2=A0#usr/include/alsa/error.h >>>> =C2=A0#usr/include/alsa/global.h >>>> =C2=A0#usr/include/alsa/hwdep.h >>>> -#usr/include/alsa/iatomic.h >>>> =C2=A0#usr/include/alsa/input.h >>>> =C2=A0#usr/include/alsa/mixer.h >>>> =C2=A0#usr/include/alsa/mixer_abst.h >>>> @@ -141,31 +151,39 @@ usr/bin/speaker-test >>>> =C2=A0#usr/include/alsa/seq_midi_event.h >>>> =C2=A0#usr/include/alsa/seqmid.h >>>> =C2=A0#usr/include/alsa/sound >>>> +#usr/include/alsa/sound/asoc.h >>>> =C2=A0#usr/include/alsa/sound/asound_fm.h >>>> =C2=A0#usr/include/alsa/sound/emu10k1.h >>>> =C2=A0#usr/include/alsa/sound/hdsp.h >>>> =C2=A0usr/include/alsa/sound/hdspm.h >>>> =C2=A0#usr/include/alsa/sound/sb16_csp.h >>>> =C2=A0#usr/include/alsa/sound/sscape_ioctl.h >>>> +#usr/include/alsa/sound/tlv.h >>>> =C2=A0#usr/include/alsa/sound/type_compat.h >>>> +#usr/include/alsa/sound/uapi >>>> +#usr/include/alsa/sound/uapi/asoc.h >>>> +#usr/include/alsa/sound/uapi/asound_fm.h >>>> +#usr/include/alsa/sound/uapi/emu10k1.h >>>> +#usr/include/alsa/sound/uapi/hdsp.h >>>> +#usr/include/alsa/sound/uapi/hdspm.h >>>> +#usr/include/alsa/sound/uapi/sb16_csp.h >>>> +#usr/include/alsa/sound/uapi/sscape_ioctl.h >>>> +#usr/include/alsa/sound/uapi/tlv.h >>>> =C2=A0#usr/include/alsa/timer.h >>>> +#usr/include/alsa/topology.h >>>> =C2=A0#usr/include/alsa/use-case.h >>>> =C2=A0#usr/include/alsa/version.h >>>> +#usr/include/asoundlib.h >>>> =C2=A0#usr/include/sys/asoundlib.h >>>> -#usr/lib/alsa-lib >>>> -#usr/lib/alsa-lib/smixer >>>> -#usr/lib/alsa-lib/smixer/smixer-ac97.la >>>> -usr/lib/alsa-lib/smixer/smixer-ac97.so >>>> -#usr/lib/alsa-lib/smixer/smixer-hda.la >>>> -usr/lib/alsa-lib/smixer/smixer-hda.so >>>> -#usr/lib/alsa-lib/smixer/smixer-python.la >>>> -usr/lib/alsa-lib/smixer/smixer-python.so >>>> -#usr/lib/alsa-lib/smixer/smixer-sbase.la >>>> -usr/lib/alsa-lib/smixer/smixer-sbase.so >>>> =C2=A0#usr/lib/libasound.la >>>> -usr/lib/libasound.so >>>> +#usr/lib/libasound.so >>>> =C2=A0usr/lib/libasound.so.2 >>>> =C2=A0usr/lib/libasound.so.2.0.0 >>>> +#usr/lib/libatopology.la >>>> +#usr/lib/libatopology.so >>>> +usr/lib/libatopology.so.2 >>>> +usr/lib/libatopology.so.2.0.0 >>>> +#usr/lib/pkgconfig/alsa-topology.pc >>>> =C2=A0#usr/lib/pkgconfig/alsa.pc >>>> =C2=A0usr/local/share/alsa >>>> =C2=A0#usr/local/share/alsa/firmware >>>> @@ -242,13 +260,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmw= are.bin >>>> =C2=A0#usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt >>>> =C2=A0#usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt >>>> =C2=A0#usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt >>>> +usr/sbin/alsa-info.sh >>>> +usr/sbin/alsabat-test.sh >>>> =C2=A0usr/sbin/alsaconf >>>> =C2=A0usr/sbin/alsactl >>>> =C2=A0#usr/share/aclocal/alsa.m4 >>>> =C2=A0usr/share/alsa >>>> =C2=A0#usr/share/alsa/alsa.conf >>>> -#usr/share/alsa/alsa.conf.d >>>> -usr/share/alsa/alsa.conf.d/README >>>> =C2=A0#usr/share/alsa/cards >>>> =C2=A0#usr/share/alsa/cards/AACI.conf >>>> =C2=A0#usr/share/alsa/cards/ATIIXP-MODEM.conf >>>> @@ -279,11 +297,13 @@ usr/share/alsa/alsa.conf.d/README >>>> =C2=A0#usr/share/alsa/cards/FireWave.conf >>>> =C2=A0#usr/share/alsa/cards/GUS.conf >>>> =C2=A0#usr/share/alsa/cards/HDA-Intel.conf >>>> +#usr/share/alsa/cards/HdmiLpeAudio.conf >>>> =C2=A0#usr/share/alsa/cards/ICE1712.conf >>>> =C2=A0#usr/share/alsa/cards/ICE1724.conf >>>> =C2=A0#usr/share/alsa/cards/ICH-MODEM.conf >>>> =C2=A0#usr/share/alsa/cards/ICH.conf >>>> =C2=A0#usr/share/alsa/cards/ICH4.conf >>>> +#usr/share/alsa/cards/Loopback.conf >>>> =C2=A0#usr/share/alsa/cards/Maestro3.conf >>>> =C2=A0#usr/share/alsa/cards/NFORCE.conf >>>> =C2=A0#usr/share/alsa/cards/PC-Speaker.conf >>>> @@ -293,10 +313,7 @@ usr/share/alsa/alsa.conf.d/README >>>> =C2=A0#usr/share/alsa/cards/RME9636.conf >>>> =C2=A0#usr/share/alsa/cards/RME9652.conf >>>> =C2=A0#usr/share/alsa/cards/SB-XFi.conf >>>> -#usr/share/alsa/cards/SI7018 >>>> =C2=A0#usr/share/alsa/cards/SI7018.conf >>>> -#usr/share/alsa/cards/SI7018/sndoc-mixer.alisp >>>> -#usr/share/alsa/cards/SI7018/sndop-mixer.alisp >>>> =C2=A0#usr/share/alsa/cards/TRID4DWAVENX.conf >>>> =C2=A0#usr/share/alsa/cards/USB-Audio.conf >>>> =C2=A0#usr/share/alsa/cards/VIA686A.conf >>>> @@ -307,10 +324,14 @@ usr/share/alsa/alsa.conf.d/README >>>> =C2=A0#usr/share/alsa/cards/VXPocket.conf >>>> =C2=A0#usr/share/alsa/cards/VXPocket440.conf >>>> =C2=A0#usr/share/alsa/cards/YMF744.conf >>>> -#usr/share/alsa/cards/aliases.alisp >>>> =C2=A0#usr/share/alsa/cards/aliases.conf >>>> +#usr/share/alsa/cards/pistachio-card.conf >>>> +#usr/share/alsa/cards/vc4-hdmi.conf >>>> +#usr/share/alsa/ctl >>>> +#usr/share/alsa/ctl/default.conf >>>> =C2=A0#usr/share/alsa/init >>>> =C2=A0#usr/share/alsa/init/00main >>>> +#usr/share/alsa/init/ca0106 >>>> =C2=A0#usr/share/alsa/init/default >>>> =C2=A0#usr/share/alsa/init/hda >>>> =C2=A0#usr/share/alsa/init/help >>>> @@ -328,52 +349,25 @@ usr/share/alsa/alsa.conf.d/README >>>> =C2=A0#usr/share/alsa/pcm/modem.conf >>>> =C2=A0#usr/share/alsa/pcm/rear.conf >>>> =C2=A0#usr/share/alsa/pcm/side.conf >>>> +#usr/share/alsa/pcm/surround21.conf >>>> =C2=A0#usr/share/alsa/pcm/surround40.conf >>>> =C2=A0#usr/share/alsa/pcm/surround41.conf >>>> =C2=A0#usr/share/alsa/pcm/surround50.conf >>>> =C2=A0#usr/share/alsa/pcm/surround51.conf >>>> =C2=A0#usr/share/alsa/pcm/surround71.conf >>>> -#usr/share/alsa/smixer.conf >>>> -#usr/share/alsa/sndo-mixer.alisp >>>> =C2=A0#usr/share/alsa/speaker-test >>>> =C2=A0#usr/share/alsa/speaker-test/sample_map.csv >>>> -#usr/share/alsa/ucm >>>> -usr/share/alsa/ucm/DAISY-I2S >>>> -usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf >>>> -usr/share/alsa/ucm/DAISY-I2S/HiFi.conf >>>> -#usr/share/alsa/ucm/PandaBoard >>>> -usr/share/alsa/ucm/PandaBoard/FMAnalog >>>> -usr/share/alsa/ucm/PandaBoard/PandaBoard.conf >>>> -usr/share/alsa/ucm/PandaBoard/hifi >>>> -usr/share/alsa/ucm/PandaBoard/hifiLP >>>> -usr/share/alsa/ucm/PandaBoard/record >>>> -usr/share/alsa/ucm/PandaBoard/voice >>>> -usr/share/alsa/ucm/PandaBoard/voiceCall >>>> -#usr/share/alsa/ucm/PandaBoardES >>>> -usr/share/alsa/ucm/PandaBoardES/FMAnalog >>>> -usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf >>>> -usr/share/alsa/ucm/PandaBoardES/hifi >>>> -usr/share/alsa/ucm/PandaBoardES/hifiLP >>>> -usr/share/alsa/ucm/PandaBoardES/record >>>> -usr/share/alsa/ucm/PandaBoardES/voice >>>> -usr/share/alsa/ucm/PandaBoardES/voiceCall >>>> -#usr/share/alsa/ucm/SDP4430 >>>> -usr/share/alsa/ucm/SDP4430/FMAnalog >>>> -usr/share/alsa/ucm/SDP4430/SDP4430.conf >>>> -usr/share/alsa/ucm/SDP4430/hifi >>>> -usr/share/alsa/ucm/SDP4430/hifiLP >>>> -usr/share/alsa/ucm/SDP4430/record >>>> -usr/share/alsa/ucm/SDP4430/voice >>>> -usr/share/alsa/ucm/SDP4430/voiceCall >>>> -#usr/share/alsa/ucm/tegraalc5632 >>>> -usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf >>>> =C2=A0#usr/share/locale/de/LC_MESSAGES/alsa-utils.mo >>>> +#usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo >>>> =C2=A0#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo >>>> =C2=A0#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo >>>> =C2=A0#usr/share/locale/ja/LC_MESSAGES/alsaconf.mo >>>> =C2=A0#usr/share/locale/ru/LC_MESSAGES/alsaconf.mo >>>> +#usr/share/locale/sk/LC_MESSAGES/alsa-utils.mo >>>> =C2=A0#usr/share/man/fr/man8/alsaconf.8 >>>> =C2=A0#usr/share/man/man1/aconnect.1 >>>> +#usr/share/man/man1/alsa-info.sh.1 >>>> +#usr/share/man/man1/alsabat.1 >>>> =C2=A0#usr/share/man/man1/alsactl.1 >>>> =C2=A0#usr/share/man/man1/alsaloop.1 >>>> =C2=A0#usr/share/man/man1/alsamixer.1 >>>> @@ -385,6 +379,9 @@ usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf >>>> =C2=A0#usr/share/man/man1/arecordmidi.1 >>>> =C2=A0#usr/share/man/man1/aseqdump.1 >>>> =C2=A0#usr/share/man/man1/aseqnet.1 >>>> +#usr/share/man/man1/axfer-list.1 >>>> +#usr/share/man/man1/axfer-transfer.1 >>>> +#usr/share/man/man1/axfer.1 >>>> =C2=A0#usr/share/man/man1/iecset.1 >>>> =C2=A0#usr/share/man/man1/speaker-test.1 >>>> =C2=A0#usr/share/man/man8/alsaconf.8 >>>> @@ -400,16 +397,3 @@ usr/share/sounds/alsa >>>> =C2=A0#usr/share/sounds/alsa/Side_Left.wav >>>> =C2=A0#usr/share/sounds/alsa/Side_Right.wav >>>> =C2=A0var/lib/alsa >>>> -etc/rc.d/init.d/alsa >>>> -lib/firmware/ess/maestro3_assp_kernel.fw >>>> -lib/firmware/ess/maestro3_assp_minisrc.fw >>>> -lib/firmware/korg/k1212.dsp >>>> -lib/firmware/sb16/alaw_main.csp >>>> -lib/firmware/sb16/ima_adpcm_capture.csp >>>> -lib/firmware/sb16/ima_adpcm_init.csp >>>> -lib/firmware/sb16/ima_adpcm_playback.csp >>>> -lib/firmware/sb16/mulaw_main.csp >>>> -lib/firmware/yamaha/ds1_ctrl.fw >>>> -lib/firmware/yamaha/ds1_dsp.fw >>>> -lib/firmware/yamaha/ds1e_ctrl.fw >>>> -lib/firmware/yamaha/yss225_registers.bin >>>> diff --git a/lfs/alsa b/lfs/alsa >>>> index 23ad58cf6..264849e11 100644 >>>> --- a/lfs/alsa >>>> +++ b/lfs/alsa >>>> @@ -25,9 +25,9 @@ >>>> =C2=A0include Config >>>> >>>> >>>> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.0.27.1 >>>> -UVER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.0.27.1 >>>> -FVER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.0.27 >>>> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.2.5.1 >>>> +UVER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.2.5.1 >>>> +FVER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.2.4 >>>> >>>> =C2=A0VERSUFIX=C2=A0=C2=A0 =3D ipfire$(KCFG) >>>> >>>> @@ -36,7 +36,7 @@ DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.bz2 >>>> =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE) >>>> =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP) >>>> =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D alsa >>>> -PAK_VER=C2=A0=C2=A0=C2=A0 =3D 12 >>>> +PAK_VER=C2=A0=C2=A0=C2=A0 =3D 13 >>>> >>>> =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D >>>> >>>> @@ -52,9 +52,9 @@ $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>>> =C2=A0alsa-utils-$(UVER).tar.bz2 =3D $(DL_FROM)/alsa-utils-$(UVER).tar.b= z2 >>>> =C2=A0alsa-firmware-$(FVER).tar.bz2 =3D $(DL_FROM)/alsa-firmware-$(FVER)= .tar.bz2 >>>> >>>> -$(DL_FILE)_MD5 =3D 17102aaab10e9d4b19f6b02937bab015 >>>> -alsa-utils-$(UVER).tar.bz2_MD5 =3D 3d81357b997744a139881ef72bc6921a >>>> -alsa-firmware-$(FVER).tar.bz2_MD5 =3D b373b350d5151dd7d64db2fc12936b04 >>>> +$(DL_FILE)_MD5 =3D c8335793e7828803311edc48fb71662e >>>> +alsa-utils-$(UVER).tar.bz2_MD5 =3D 8f142bebff84ff05438b46a0e896f53a >>>> +alsa-firmware-$(FVER).tar.bz2_MD5 =3D ee6c1d24a1a4ac1d86992b408ed710a2 >>>> >>>> =C2=A0install : $(TARGET) >> --===============7108044255570042116==--