alsa: updated to 1.0.24.x

diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index d87664d7f7cf4cd82776a399c0f63e1607aff50f..c9db15008c853ce7cc0e189977dfd870d758d6ad 100644 (file)
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/alsa
 lib/firmware/aica_firmware.bin
 #lib/firmware/asihpi
 lib/firmware/asihpi/dsp2400.bin
@@ -45,22 +46,25 @@ lib/firmware/emagic/emi26-bitstream.bin
 lib/firmware/emagic/emi26-firmware.bin
 lib/firmware/emagic/emi26-loader.bin
 lib/firmware/emagic/emi62-bitstream.bin
+lib/firmware/emagic/emi62-firmware.bin
 lib/firmware/emagic/emi62-firmware-midi.bin
 lib/firmware/emagic/emi62-firmware-spdif.bin
-lib/firmware/emagic/emi62-firmware.bin
 lib/firmware/emagic/emi62-loader.bin
 lib/firmware/emagic/license.txt
 #lib/firmware/emu
 lib/firmware/emu/audio_dock.fw
 lib/firmware/emu/emu0404.fw
-lib/firmware/emu/emu1010_notebook.fw
 lib/firmware/emu/emu1010b.fw
+lib/firmware/emu/emu1010_notebook.fw
 lib/firmware/emu/hana.fw
 lib/firmware/emu/micro_dock.fw
+lib/firmware/ess/maestro3_assp_kernel.fw
+lib/firmware/ess/maestro3_assp_minisrc.fw
+lib/firmware/korg/k1212.dsp
 #lib/firmware/mixart
+lib/firmware/mixart/miXart8AES.xlx
 lib/firmware/mixart/miXart8.elf
 lib/firmware/mixart/miXart8.xlx
-lib/firmware/mixart/miXart8AES.xlx
 lib/firmware/multiface_firmware.bin
 lib/firmware/multiface_firmware_rev11.bin
 #lib/firmware/pcxhr
@@ -86,6 +90,12 @@ lib/firmware/pcxhr/xlxc882e.dat
 lib/firmware/pcxhr/xlxc882hr.dat
 lib/firmware/pcxhr/xlxc924.dat
 lib/firmware/pcxhr/xlxint.dat
+lib/firmware/rpm_firmware.bin
+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/turtlebeach
 lib/firmware/turtlebeach/msndinit.bin
 lib/firmware/turtlebeach/msndperm.bin
@@ -105,9 +115,15 @@ lib/firmware/vx/x1_1_vp4.xlx
 lib/firmware/vx/x1_1_vx2.xlx
 lib/firmware/vx/x1_1_vxp.xlx
 lib/firmware/vx/x1_2_v22.xlx
+lib/firmware/yamaha/ds1_ctrl.fw
+lib/firmware/yamaha/ds1_dsp.fw
+lib/firmware/yamaha/ds1e_ctrl.fw
 lib/firmware/yamaha/yss225_registers.bin
+lib/udev/rules.d/90-alsa-restore.rules
 usr/bin/aconnect
+usr/bin/alsaloop
 usr/bin/alsamixer
+usr/bin/alsaucm
 usr/bin/amidi
 usr/bin/amixer
 usr/bin/aplay
@@ -124,36 +140,38 @@ usr/bin/speaker-test
 #usr/include/alsa/asoundef.h
 #usr/include/alsa/asoundlib.h
 #usr/include/alsa/conf.h
-#usr/include/alsa/control.h
 #usr/include/alsa/control_external.h
+#usr/include/alsa/control.h
 #usr/include/alsa/error.h
 #usr/include/alsa/global.h
 #usr/include/alsa/hwdep.h
 #usr/include/alsa/iatomic.h
 #usr/include/alsa/input.h
-#usr/include/alsa/mixer.h
 #usr/include/alsa/mixer_abst.h
+#usr/include/alsa/mixer.h
 #usr/include/alsa/output.h
-#usr/include/alsa/pcm.h
 #usr/include/alsa/pcm_external.h
 #usr/include/alsa/pcm_extplug.h
+#usr/include/alsa/pcm.h
 #usr/include/alsa/pcm_ioplug.h
 #usr/include/alsa/pcm_old.h
 #usr/include/alsa/pcm_plugin.h
 #usr/include/alsa/pcm_rate.h
 #usr/include/alsa/rawmidi.h
-#usr/include/alsa/seq.h
 #usr/include/alsa/seq_event.h
-#usr/include/alsa/seq_midi_event.h
+#usr/include/alsa/seq.h
 #usr/include/alsa/seqmid.h
+#usr/include/alsa/seq_midi_event.h
 #usr/include/alsa/sound
 #usr/include/alsa/sound/asound_fm.h
 #usr/include/alsa/sound/emu10k1.h
 #usr/include/alsa/sound/hdsp.h
+usr/include/alsa/sound/hdspm.h
 #usr/include/alsa/sound/sb16_csp.h
 #usr/include/alsa/sound/sscape_ioctl.h
 #usr/include/alsa/sound/type_compat.h
 #usr/include/alsa/timer.h
+#usr/include/alsa/use-case.h
 #usr/include/alsa/version.h
 #usr/include/sys/asoundlib.h
 #usr/lib/alsa-lib
@@ -183,11 +201,12 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
 #usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
 #usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
+usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
 #usr/local/share/alsa/firmware/mixartloader
-#usr/local/share/alsa/firmware/mixartloader/miXart.conf
+#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
 #usr/local/share/alsa/firmware/mixartloader/miXart8.elf
 #usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
-#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
+#usr/local/share/alsa/firmware/mixartloader/miXart.conf
 #usr/local/share/alsa/firmware/pcxhrloader
 #usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
 #usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
@@ -202,13 +221,13 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
 #usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
 #usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
+#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
 #usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
 #usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
 #usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
@@ -221,17 +240,17 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/usx2yloader
 #usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us122.conf
+#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us122.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us122.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us224.conf
+#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us224.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us224.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us428.conf
+#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us428.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us428.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
 #usr/local/share/alsa/firmware/vxloader
 #usr/local/share/alsa/firmware/vxloader/bd56002.boot
 #usr/local/share/alsa/firmware/vxloader/bd563s3.boot
@@ -257,19 +276,21 @@ usr/share/alsa
 #usr/share/alsa/alsa.conf
 #usr/share/alsa/cards
 #usr/share/alsa/cards/AACI.conf
+#usr/share/alsa/cards/aliases.alisp
+#usr/share/alsa/cards/aliases.conf
+#usr/share/alsa/cards/ATIIXP.conf
 #usr/share/alsa/cards/ATIIXP-MODEM.conf
 #usr/share/alsa/cards/ATIIXP-SPDMA.conf
-#usr/share/alsa/cards/ATIIXP.conf
 #usr/share/alsa/cards/AU8810.conf
 #usr/share/alsa/cards/AU8820.conf
 #usr/share/alsa/cards/AU8830.conf
-#usr/share/alsa/cards/Audigy.conf
 #usr/share/alsa/cards/Audigy2.conf
+#usr/share/alsa/cards/Audigy.conf
 #usr/share/alsa/cards/Aureon51.conf
 #usr/share/alsa/cards/Aureon71.conf
 #usr/share/alsa/cards/CA0106.conf
-#usr/share/alsa/cards/CMI8338-SWIEC.conf
 #usr/share/alsa/cards/CMI8338.conf
+#usr/share/alsa/cards/CMI8338-SWIEC.conf
 #usr/share/alsa/cards/CMI8738-MC6.conf
 #usr/share/alsa/cards/CMI8738-MC8.conf
 #usr/share/alsa/cards/CMI8788.conf
@@ -284,9 +305,9 @@ usr/share/alsa
 #usr/share/alsa/cards/HDA-Intel.conf
 #usr/share/alsa/cards/ICE1712.conf
 #usr/share/alsa/cards/ICE1724.conf
-#usr/share/alsa/cards/ICH-MODEM.conf
-#usr/share/alsa/cards/ICH.conf
 #usr/share/alsa/cards/ICH4.conf
+#usr/share/alsa/cards/ICH.conf
+#usr/share/alsa/cards/ICH-MODEM.conf
 #usr/share/alsa/cards/Maestro3.conf
 #usr/share/alsa/cards/NFORCE.conf
 #usr/share/alsa/cards/PC-Speaker.conf
@@ -303,15 +324,13 @@ usr/share/alsa
 #usr/share/alsa/cards/TRID4DWAVENX.conf
 #usr/share/alsa/cards/USB-Audio.conf
 #usr/share/alsa/cards/VIA686A.conf
-#usr/share/alsa/cards/VIA8233.conf
 #usr/share/alsa/cards/VIA8233A.conf
+#usr/share/alsa/cards/VIA8233.conf
 #usr/share/alsa/cards/VIA8237.conf
 #usr/share/alsa/cards/VX222.conf
-#usr/share/alsa/cards/VXPocket.conf
 #usr/share/alsa/cards/VXPocket440.conf
+#usr/share/alsa/cards/VXPocket.conf
 #usr/share/alsa/cards/YMF744.conf
-#usr/share/alsa/cards/aliases.alisp
-#usr/share/alsa/cards/aliases.conf
 #usr/share/alsa/init
 #usr/share/alsa/init/00main
 #usr/share/alsa/init/default
@@ -341,12 +360,14 @@ usr/share/alsa
 #usr/share/alsa/speaker-test
 #usr/share/alsa/speaker-test/sample_map.csv
 #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo
+#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo
 #usr/share/man/fr/man8/alsaconf.8
 #usr/share/man/man1/aconnect.1
 #usr/share/man/man1/alsactl.1
+#usr/share/man/man1/alsaloop.1
 #usr/share/man/man1/alsamixer.1
 #usr/share/man/man1/amidi.1
 #usr/share/man/man1/amixer.1
@@ -370,15 +391,4 @@ usr/share/sounds/alsa
 #usr/share/sounds/alsa/Rear_Right.wav
 #usr/share/sounds/alsa/Side_Left.wav
 #usr/share/sounds/alsa/Side_Right.wav
-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
+var/lib/alsa

diff --git a/lfs/alsa b/lfs/alsa
index d2eaadbbaf6865ec7ca6e88ef6eb416240bfedc9..f6f6df8046fe6eaf08b931d6c90342aee0798884 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,17 +34,17 @@ else
 endif
 endif
 
-VER        = 1.0.23
-UVER       = 1.0.23
-FVER       = 1.0.23
-DVER       = 1.0.23
+VER        = 1.0.24.1
+UVER       = 1.0.24.2
+FVER       = 1.0.24.1
+DVER       = 1.0.24
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -66,10 +66,10 @@ alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2
 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2
 alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2
 
-$(DL_FILE)_MD5 = f48b50421d8a69d2d806d9c47e534f0d
-alsa-utils-$(UVER).tar.bz2_MD5 = cb0cf46029ac9549cf3a31bff6a4f4e1
-alsa-firmware-$(FVER).tar.bz2_MD5 = e3f755331d6d485f6fd697249b90f877
-alsa-driver-$(DVER).tar.bz2_MD5 = 4be102f995bd4cc68e6e8178b0d19ec2
+$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226
+alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2
+alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b
+alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e
 
 install : $(TARGET)