X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Falsa;h=d2eaadbbaf6865ec7ca6e88ef6eb416240bfedc9;hp=0afe8a81f1dc4a5be1b098fa98ab75b40d216de1;hb=ed10297e1bf16da05f429e1c6f1fc21926d96474;hpb=bc8ca5e45f61adfc427e3673e5adc7584cfec496

diff --git a/lfs/alsa b/lfs/alsa
index 0afe8a81f1..d2eaadbbaf 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,31 +24,52 @@
 
 include Config
 
-VER        = 1.0.13
+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)
-TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 1
+PAK_VER    = 8
 
-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-$(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-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 = d55a9d7d2a79d738a1b7a511cffda4b6
-alsa-utils-$(VER).tar.bz2_MD5 = dfe4bb5d3217f3ec662b172ce8397cf0
+$(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)
 
@@ -82,13 +101,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-$(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
-	cd $(DIR_SRC)/alsa-utils-$(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)