X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Falsa;h=d2eaadbbaf6865ec7ca6e88ef6eb416240bfedc9;hb=c8d680dc8df1b2f7138ae3a8745fd021b0f7ae42;hp=e2582277521687ead9be6452c8fd650caaa609cc;hpb=4ef84d05834bb0522b1a16f15dc74c8d7d53cca4;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/alsa b/lfs/alsa
index e258227752..d2eaadbbaf 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #
@@ -24,41 +24,52 @@
 
 include Config
 
-VER        = 1.0.17
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+endif
+
+VER        = 1.0.23
+UVER       = 1.0.23
+FVER       = 1.0.23
+DVER       = 1.0.23
 
 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    = 3
+PAK_VER    = 8
 
 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-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 \
+		alsa-driver-$(DVER).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
+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 = 9bbbdc502478cdc75074c9ba42c385b3
-alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6
-alsa-firmware-$(VER).tar.bz_MD5 = 2a334a2b736cc6244162d7cc83247075d
-alsa-firmware-$(VER).tar.bz_MD5 = 26044062d13dbfe61c0330fe9915cfdb4
+$(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
 
 install : $(TARGET)
 
@@ -92,25 +103,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-driver-$(DVER).tar.bz2
+	cd $(DIR_SRC)/alsa-driver-$(DVER) && sed -i -e "s| soc/ | |g" Makefile
+	cd $(DIR_SRC)/alsa-driver-$(DVER) && sed -i -e "s| soc||g" Makefile
+	cd $(DIR_SRC)/alsa-driver-$(DVER) && ./configure --with-kernel=/usr/src/linux
+	cd $(DIR_SRC)/alsa-driver-$(DVER) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/alsa-driver-$(DVER) && 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) && 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
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2
+	cd $(DIR_SRC)/alsa-utils-$(UVER) && ./configure --disable-xmlto
+	cd $(DIR_SRC)/alsa-utils-$(UVER) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/alsa-utils-$(UVER) && make install
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(FVER).tar.bz2
+	cd $(DIR_SRC)/alsa-firmware-$(FVER) && ./configure
+	cd $(DIR_SRC)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/alsa-firmware-$(FVER) && make install
 endif
 	@rm -rf $(DIR_SRC)/alsa*
 	@$(POSTBUILD)