Update alsa-lib & utils to 1.0.17

add alsa-drivers & firmware 1.0.17
fix missing audio group

diff --git a/config/etc/group b/config/etc/group
index 7d5fb159b3fa26f6f41e2c57f3b2eba2685143e0..6c53c1489d673f5a6a3f686771929f3d5282fe80 100644 (file)
--- a/config/etc/group
+++ b/config/etc/group
@@ -38,4 +38,5 @@ postdrop:x:108:
 clamav:x:109:
 amavis:x:110:
 mldonkey:x:111:
+audio:x:112:
 samba:x:1000:

diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index c6e850b5277f789b67d3cde251d58a4d32041bcc..a127b2fc5fdd882253f1bcc778113f6b708df8da 100644 (file)
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -1,4 +1,108 @@
-etc/rc.d/init.d/alsa
+lib/firmware/aica_firmware.bin
+#lib/firmware/asihpi
+lib/firmware/asihpi/dsp2400.bin
+lib/firmware/asihpi/dsp4300.bin
+lib/firmware/asihpi/dsp5000.bin
+lib/firmware/asihpi/dsp6200.bin
+lib/firmware/asihpi/dsp6205.bin
+lib/firmware/asihpi/dsp6400.bin
+lib/firmware/asihpi/dsp6600.bin
+lib/firmware/asihpi/dsp8700.bin
+lib/firmware/asihpi/dsp8900.bin
+lib/firmware/digiface_firmware.bin
+lib/firmware/digiface_firmware_rev11.bin
+#lib/firmware/ea
+lib/firmware/ea/3g_asic.fw
+lib/firmware/ea/darla20_dsp.fw
+lib/firmware/ea/darla24_dsp.fw
+lib/firmware/ea/echo3g_dsp.fw
+lib/firmware/ea/gina20_dsp.fw
+lib/firmware/ea/gina24_301_asic.fw
+lib/firmware/ea/gina24_301_dsp.fw
+lib/firmware/ea/gina24_361_asic.fw
+lib/firmware/ea/gina24_361_dsp.fw
+lib/firmware/ea/indigo_dj_dsp.fw
+lib/firmware/ea/indigo_dsp.fw
+lib/firmware/ea/indigo_io_dsp.fw
+lib/firmware/ea/layla20_asic.fw
+lib/firmware/ea/layla20_dsp.fw
+lib/firmware/ea/layla24_1_asic.fw
+lib/firmware/ea/layla24_2A_asic.fw
+lib/firmware/ea/layla24_2S_asic.fw
+lib/firmware/ea/layla24_dsp.fw
+lib/firmware/ea/loader_dsp.fw
+lib/firmware/ea/mia_dsp.fw
+lib/firmware/ea/mona_2_asic.fw
+lib/firmware/ea/mona_301_1_asic_48.fw
+lib/firmware/ea/mona_301_1_asic_96.fw
+lib/firmware/ea/mona_301_dsp.fw
+lib/firmware/ea/mona_361_1_asic_48.fw
+lib/firmware/ea/mona_361_1_asic_96.fw
+lib/firmware/ea/mona_361_dsp.fw
+#lib/firmware/emagic
+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-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/hana.fw
+lib/firmware/emu/micro_dock.fw
+#lib/firmware/ess
+lib/firmware/ess/maestro3_assp_kernel.fw
+lib/firmware/ess/maestro3_assp_minisrc.fw
+#lib/firmware/korg
+lib/firmware/korg/k1212.dsp
+#lib/firmware/mixart
+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
+lib/firmware/pcxhr/b321_512.b56
+lib/firmware/pcxhr/d321_512.d56
+lib/firmware/pcxhr/e321_512.e56
+lib/firmware/pcxhr/xc_1_882.dat
+lib/firmware/pcxhr/xi_1_882.dat
+#lib/firmware/sb16
+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
+lib/firmware/turtlebeach/pndsperm.bin
+lib/firmware/turtlebeach/pndspini.bin
+#lib/firmware/vx
+lib/firmware/vx/bd56002.boot
+lib/firmware/vx/bd563s3.boot
+lib/firmware/vx/bd563v2.boot
+lib/firmware/vx/bx_1_vp4.b56
+lib/firmware/vx/bx_1_vxp.b56
+lib/firmware/vx/l_1_v22.d56
+lib/firmware/vx/l_1_vp4.d56
+lib/firmware/vx/l_1_vx2.d56
+lib/firmware/vx/l_1_vxp.d56
+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
+lib/firmware/yamaha/ds1_ctrl.fw
+lib/firmware/yamaha/ds1_dsp.fw
+lib/firmware/yamaha/ds1e_ctrl.fw
+lib/firmware/yamaha/yss225_registers.bin
 usr/bin/aconnect
 usr/bin/alsamixer
 usr/bin/amidi
@@ -19,13 +123,11 @@ usr/bin/speaker-test
 #usr/include/alsa/conf.h
 #usr/include/alsa/control.h
 #usr/include/alsa/control_external.h
-#usr/include/alsa/conv.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/instr.h
 #usr/include/alsa/mixer.h
 #usr/include/alsa/mixer_abst.h
 #usr/include/alsa/output.h
@@ -42,10 +144,6 @@ usr/bin/speaker-test
 #usr/include/alsa/seq_midi_event.h
 #usr/include/alsa/seqmid.h
 #usr/include/alsa/sound
-#usr/include/alsa/sound/ainstr_fm.h
-#usr/include/alsa/sound/ainstr_gf1.h
-#usr/include/alsa/sound/ainstr_iw.h
-#usr/include/alsa/sound/ainstr_simple.h
 #usr/include/alsa/sound/asound_fm.h
 #usr/include/alsa/sound/emu10k1.h
 #usr/include/alsa/sound/hdsp.h
@@ -72,111 +170,165 @@ usr/lib/libasound.so
 usr/lib/libasound.so.2
 usr/lib/libasound.so.2.0.0
 #usr/lib/pkgconfig/alsa.pc
-#usr/man/fr
-#usr/man/fr/man8
-#usr/man/fr/man8/alsaconf.8
-#usr/man/man1/aconnect.1
-#usr/man/man1/alsactl.1
-#usr/man/man1/alsamixer.1
-#usr/man/man1/amidi.1
-#usr/man/man1/amixer.1
-#usr/man/man1/aplay.1
-#usr/man/man1/aplaymidi.1
-#usr/man/man1/arecord.1
-#usr/man/man1/arecordmidi.1
-#usr/man/man1/aseqdump.1
-#usr/man/man1/aseqnet.1
-#usr/man/man1/iecset.1
-#usr/man/man1/speaker-test.1
-#usr/man/man8/alsaconf.8
+usr/local/share/alsa
+#usr/local/share/alsa/firmware
+#usr/local/share/alsa/firmware/hdsploader
+#usr/local/share/alsa/firmware/hdsploader/digiface_firmware.bin
+#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/mixartloader
+#usr/local/share/alsa/firmware/mixartloader/miXart.conf
+#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/pcxhrloader
+#usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
+#usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
+#usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
+#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/usx2yloader
+#usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
+#usr/local/share/alsa/firmware/usx2yloader/us122.conf
+#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/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/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
+#usr/local/share/alsa/firmware/vxloader/bd563v2.boot
+#usr/local/share/alsa/firmware/vxloader/bx_1_vp4.b56
+#usr/local/share/alsa/firmware/vxloader/bx_1_vxp.b56
+#usr/local/share/alsa/firmware/vxloader/l_1_v22.d56
+#usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56
+#usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56
+#usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56
+#usr/local/share/alsa/firmware/vxloader/vx222.conf
+#usr/local/share/alsa/firmware/vxloader/vxboard.conf
+#usr/local/share/alsa/firmware/vxloader/vxp440.conf
+#usr/local/share/alsa/firmware/vxloader/vxpocket.conf
+#usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt
+#usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt
+#usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt
+#usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt
 usr/sbin/alsaconf
 usr/sbin/alsactl
 #usr/share/aclocal/alsa.m4
-#usr/share/alsa
-usr/share/alsa/alsa.conf
+usr/share/alsa
+#usr/share/alsa/alsa.conf
 #usr/share/alsa/cards
-usr/share/alsa/cards/AACI.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/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/CMI8738-MC6.conf
-usr/share/alsa/cards/CMI8738-MC8.conf
-usr/share/alsa/cards/CS46xx.conf
-usr/share/alsa/cards/EMU10K1.conf
-usr/share/alsa/cards/EMU10K1X.conf
-usr/share/alsa/cards/ENS1370.conf
-usr/share/alsa/cards/ENS1371.conf
-usr/share/alsa/cards/ES1968.conf
-usr/share/alsa/cards/FM801.conf
-usr/share/alsa/cards/GUS.conf
-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/Maestro3.conf
-usr/share/alsa/cards/NFORCE.conf
-usr/share/alsa/cards/PC-Speaker.conf
-usr/share/alsa/cards/PMac.conf
-usr/share/alsa/cards/PMacToonie.conf
-usr/share/alsa/cards/RME9636.conf
-usr/share/alsa/cards/RME9652.conf
-usr/share/alsa/cards/SI7018
-usr/share/alsa/cards/SI7018.conf
-usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
-usr/share/alsa/cards/SI7018/sndop-mixer.alisp
-usr/share/alsa/cards/TRID4DWAVENX.conf
-usr/share/alsa/cards/VIA686A.conf
-usr/share/alsa/cards/VIA8233.conf
-usr/share/alsa/cards/VIA8233A.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/YMF744.conf
-usr/share/alsa/cards/aliases.alisp
-usr/share/alsa/cards/aliases.conf
+#usr/share/alsa/cards/AACI.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/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/CMI8738-MC6.conf
+#usr/share/alsa/cards/CMI8738-MC8.conf
+#usr/share/alsa/cards/CMI8788.conf
+#usr/share/alsa/cards/CS46xx.conf
+#usr/share/alsa/cards/EMU10K1.conf
+#usr/share/alsa/cards/EMU10K1X.conf
+#usr/share/alsa/cards/ENS1370.conf
+#usr/share/alsa/cards/ENS1371.conf
+#usr/share/alsa/cards/ES1968.conf
+#usr/share/alsa/cards/FM801.conf
+#usr/share/alsa/cards/GUS.conf
+#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/Maestro3.conf
+#usr/share/alsa/cards/NFORCE.conf
+#usr/share/alsa/cards/PC-Speaker.conf
+#usr/share/alsa/cards/PMac.conf
+#usr/share/alsa/cards/PMacToonie.conf
+#usr/share/alsa/cards/PS3.conf
+#usr/share/alsa/cards/RME9636.conf
+#usr/share/alsa/cards/RME9652.conf
+#usr/share/alsa/cards/SI7018
+#usr/share/alsa/cards/SI7018.conf
+#usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
+#usr/share/alsa/cards/SI7018/sndop-mixer.alisp
+#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/VIA8237.conf
+#usr/share/alsa/cards/VX222.conf
+#usr/share/alsa/cards/VXPocket.conf
+#usr/share/alsa/cards/VXPocket440.conf
+#usr/share/alsa/cards/YMF744.conf
+#usr/share/alsa/cards/aliases.alisp
+#usr/share/alsa/cards/aliases.conf
 #usr/share/alsa/pcm
-usr/share/alsa/pcm/center_lfe.conf
-usr/share/alsa/pcm/default.conf
-usr/share/alsa/pcm/dmix.conf
-usr/share/alsa/pcm/dpl.conf
-usr/share/alsa/pcm/dsnoop.conf
-usr/share/alsa/pcm/front.conf
-usr/share/alsa/pcm/iec958.conf
-usr/share/alsa/pcm/modem.conf
-usr/share/alsa/pcm/rear.conf
-usr/share/alsa/pcm/side.conf
-usr/share/alsa/pcm/surround40.conf
-usr/share/alsa/pcm/surround41.conf
-usr/share/alsa/pcm/surround50.conf
-usr/share/alsa/pcm/surround51.conf
-usr/share/alsa/pcm/surround71.conf
+#usr/share/alsa/pcm/center_lfe.conf
+#usr/share/alsa/pcm/default.conf
+#usr/share/alsa/pcm/dmix.conf
+#usr/share/alsa/pcm/dpl.conf
+#usr/share/alsa/pcm/dsnoop.conf
+#usr/share/alsa/pcm/front.conf
+#usr/share/alsa/pcm/hdmi.conf
+#usr/share/alsa/pcm/iec958.conf
+#usr/share/alsa/pcm/modem.conf
+#usr/share/alsa/pcm/rear.conf
+#usr/share/alsa/pcm/side.conf
+#usr/share/alsa/pcm/surround40.conf
+#usr/share/alsa/pcm/surround41.conf
+#usr/share/alsa/pcm/surround50.conf
+#usr/share/alsa/pcm/surround51.conf
+#usr/share/alsa/pcm/surround71.conf
+#usr/share/alsa/smixer.conf
 #usr/share/alsa/sndo-mixer.alisp
 #usr/share/alsa/speaker-test
-usr/share/alsa/speaker-test/sample_map.csv
+#usr/share/alsa/speaker-test/sample_map.csv
 #usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ja/LC_MESSAGES/alsaconf.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/alsamixer.1
+#usr/share/man/man1/amidi.1
+#usr/share/man/man1/amixer.1
+#usr/share/man/man1/aplay.1
+#usr/share/man/man1/aplaymidi.1
+#usr/share/man/man1/arecord.1
+#usr/share/man/man1/arecordmidi.1
+#usr/share/man/man1/aseqdump.1
+#usr/share/man/man1/aseqnet.1
+#usr/share/man/man1/iecset.1
+#usr/share/man/man1/speaker-test.1
+#usr/share/man/man8/alsaconf.8
 #usr/share/sounds
-#usr/share/sounds/alsa
-usr/share/sounds/alsa/Front_Center.wav
-usr/share/sounds/alsa/Front_Left.wav
-usr/share/sounds/alsa/Front_Right.wav
-usr/share/sounds/alsa/Noise.wav
-usr/share/sounds/alsa/Rear_Center.wav
-usr/share/sounds/alsa/Rear_Left.wav
-usr/share/sounds/alsa/Rear_Right.wav
-usr/share/sounds/alsa/Side_Left.wav
-usr/share/sounds/alsa/Side_Right.wav
+usr/share/sounds/alsa
+#usr/share/sounds/alsa/Front_Center.wav
+#usr/share/sounds/alsa/Front_Left.wav
+#usr/share/sounds/alsa/Front_Right.wav
+#usr/share/sounds/alsa/Noise.wav
+#usr/share/sounds/alsa/Rear_Center.wav
+#usr/share/sounds/alsa/Rear_Left.wav
+#usr/share/sounds/alsa/Rear_Right.wav
+#usr/share/sounds/alsa/Side_Left.wav
+#usr/share/sounds/alsa/Side_Right.wav

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 28632f8cc2b926078beee11c1a592b326fdbb45c..ef798bc339afe304cd9bd82309434a7eab0a5eac 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -32,7 +32,8 @@
 * URI-1.35
 * Unix-Syslog-0.100
 * XML-Parser-2.34
-* alsa-lib-1.0.15
+* alsa-lib-1.0.17
+* alsa-lib-1.0.17-kmod
 * amavisd-new-2.5.2
 * applejuice-0.30
 * arping-2.05

diff --git a/lfs/alsa b/lfs/alsa
index 3e946c60fe99b5bffb797eced05cbc8cff0112c3..e2582277521687ead9be6452c8fd650caaa609cc 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -24,15 +24,23 @@
 
 include Config
 
-VER        = 1.0.15
+VER        = 1.0.17
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+ifeq "$(KMOD)" "1"
+ifeq "$(SMP)" "1"
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
+endif
+else
 TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 PROG       = alsa
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,9 +52,13 @@ objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 alsa-utils-$(VER).tar.bz2 = $(DL_FROM)/alsa-utils-$(VER).tar.bz2
+alsa-firmware-$(VER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(VER).tar.bz2
+alsa-driver-$(VER).tar.bz2 = $(DL_FROM)/alsa-driver-$(VER).tar.bz2
 
-$(DL_FILE)_MD5 = 94254ea0d2c966a58184b134e9da29ff
-alsa-utils-$(VER).tar.bz2_MD5 = 287f46f891581c15018de4f8c0731575
+$(DL_FILE)_MD5 = 9bbbdc502478cdc75074c9ba42c385b3
+alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6
+alsa-firmware-$(VER).tar.bz_MD5 = 2a334a2b736cc6244162d7cc83247075d
+alsa-firmware-$(VER).tar.bz_MD5 = 26044062d13dbfe61c0330fe9915cfdb4
 
 install : $(TARGET)
 
@@ -78,13 +90,27 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_SRC)/alsa* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_SRC)/alsa*
+ifeq "$(KMOD)" "1"
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-driver-$(VER).tar.bz2
+       cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc/ | |g" Makefile
+       cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc||g" Makefile
+       cd $(DIR_SRC)/alsa-driver-$(VER) && ./configure
+       cd $(DIR_SRC)/alsa-driver-$(VER) && make
+       cd $(DIR_SRC)/alsa-driver-$(VER) && make install
+else
+       cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --enable-static
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(VER).tar.bz2
        cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure
-       cd $(DIR_SRC)/alsa-utils-$(VER) && make
+       cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING)
        cd $(DIR_SRC)/alsa-utils-$(VER) && make install
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(VER).tar.bz2
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && ./configure
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && make $(MAKETUNING)
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && make install
+endif
        @rm -rf $(DIR_SRC)/alsa*
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 4ae3d116a615162e804b0a32136de2490d18850a..7de5dbe8f27d5ada9bcaa8d1d971cea203c59520 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -342,6 +342,7 @@ buildipfire() {
   ipfiremake kqemu                     SMP=1
   ipfiremake v4l-dvb                   SMP=1
   ipfiremake madwifi                    SMP=1
+  ipfiremake alsa              KMOD=1  SMP=1
   ipfiremake sane              KMOD=1  SMP=1
   ipfiremake openswan          KMOD=1  SMP=1
   ipfiremake linux
@@ -353,6 +354,7 @@ buildipfire() {
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
+  ipfiremake alsa              KMOD=1
   ipfiremake sane              KMOD=1
   ipfiremake openswan          KMOD=1
   ipfiremake pkg-config

diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh
index b05ee4fe0f439ae794c1a78958fc4e7721e7a4fa..7b6b3dc80d2a414351fd5eb55c39b901025d976c 100644 (file)
--- a/src/paks/alsa/install.sh
+++ b/src/paks/alsa/install.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+groupadd audio 2>/dev/null
 touch /etc/asound.state
 ln -svf  ../init.d/alsa /etc/rc.d/rc3.d/S65alsa
 ln -svf  ../init.d/alsa /etc/rc.d/rc0.d/K35alsa