Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / lfs / alsa

diff --git a/lfs/alsa b/lfs/alsa
index 6bc2a56c61ccdb541faf9b89143cd1ae04c12a83..54b898fc1dfb2ef24cbcba7c8c5758fe91904c3b 100644 (file)
--- 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) 2007-2011  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,45 @@
 
 include Config
 
-VER        = 1.0.17
+
+VER        = 1.0.25
+UVER       = 1.0.25
+FVER       = 1.0.25
+DVER       = 1.0.25
+
+VERSUFIX   = ipfire$(KCFG)
 
 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    = 10
 
 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 alsa-firmware-$(VER).tar.bz2 alsa-driver-$(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.bz2_MD5 = a334a2b736cc6244162d7cc83247075d
-alsa-driver-$(VER).tar.bz2_MD5 = 6044062d13dbfe61c0330fe9915cfdb4
+$(DL_FILE)_MD5 = 06fe5819020c6684b991dcffc5471304
+alsa-utils-$(UVER).tar.bz2_MD5 = f81f9dcb9a014fd32cb3a70066a5b9a9
+alsa-firmware-$(FVER).tar.bz2_MD5 = f1939da45b162c83a726c54a470ef139
+alsa-driver-$(DVER).tar.bz2_MD5 = ac56465c262ced60b5eb2d6492d7a923
 
 install : $(TARGET)
 
@@ -92,25 +96,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 --with-kernel=/usr/src/linux
-       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) && ./configure
+       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)