X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Falsa;h=56419a85a800e8b0841c206a609a9900780b2a06;hb=57ffe60f800c9ad96b31bee7316959b5d054baf6;hp=6bc2a56c61ccdb541faf9b89143cd1ae04c12a83;hpb=458f04f29e521175bf9573d4b80002d9a97a7860;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/alsa b/lfs/alsa
index 6bc2a56c61..56419a85a8 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -24,26 +24,29 @@
 
 include Config
 
-VER        = 1.0.17
+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)
-ifeq "$(KMOD)" "1"
-ifeq "$(SMP)" "1"
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-endif
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
 PROG       = alsa
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
+ifeq "$(KMOD)" "1"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+else
+	TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -55,10 +58,10 @@ 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 = 9bbbdc502478cdc75074c9ba42c385b3
-alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6
-alsa-firmware-$(VER).tar.bz2_MD5 = a334a2b736cc6244162d7cc83247075d
-alsa-driver-$(VER).tar.bz2_MD5 = 6044062d13dbfe61c0330fe9915cfdb4
+$(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)
 
@@ -96,20 +99,20 @@ ifeq "$(KMOD)" "1"
 	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
+	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 $(MAKETUNING)
+	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)
+	cd $(DIR_SRC)/alsa-firmware-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/alsa-firmware-$(VER) && make install
 endif
 	@rm -rf $(DIR_SRC)/alsa*