X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Falsa;h=56419a85a800e8b0841c206a609a9900780b2a06;hb=4a35d2d32571ab7d82aaaf268746dbe1e18eff56;hp=65ac903e331009ed7ff0a61b810a147df55c8db5;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/alsa b/lfs/alsa
index 65ac903e33..56419a85a8 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -24,31 +24,44 @@
 
 include Config
 
-VER        = 1.0.13
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = 1.0.19
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 1
+PAK_VER    = 5
 
-DESCDE     = "Alsa ist ein Linux-Sound-Server."
-DESCEN     = "Alsa is a linux sound server."
 DEPS       = ""
 
+ifeq "$(KMOD)" "1"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+else
+	TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2
+objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2 alsa-firmware-$(VER).tar.bz2 alsa-driver-$(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 = d55a9d7d2a79d738a1b7a511cffda4b6
-alsa-utils-$(VER).tar.bz2_MD5 = dfe4bb5d3217f3ec662b172ce8397cf0
+$(DL_FILE)_MD5 = 73db3666c211e5fb023bb77450cf430d
+alsa-utils-$(VER).tar.bz2_MD5 = 5ff0379c707c1a29083233edc9ab4e06
+alsa-firmware-$(VER).tar.bz2_MD5 = bb93a1a58066bdb2308dc7b117df2b67
+alsa-driver-$(VER).tar.bz2_MD5 = 7045d69c49e70bb88278b8015d5eb509
 
 install : $(TARGET)
 
@@ -80,13 +93,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 --with-kernel=/usr/src/linux
+	cd $(DIR_SRC)/alsa-driver-$(VER) && make $(MAKETUNING) $(EXTRA_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 $(MAKETUNING) $(EXTRA_MAKE)
 	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) && ./configure --disable-xmlto
+	cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
 	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) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/alsa-firmware-$(VER) && make install
+endif
 	@rm -rf $(DIR_SRC)/alsa*
 	@$(POSTBUILD)