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

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

diff --git a/lfs/alsa b/lfs/alsa
index b70d1e3615e5006dccfe3455e05c689ca60a909e..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,23 +24,20 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
 
-VER        = 1.0.22
-UVER       = 1.0.22
-FVER       = 1.0.20
-DVER       = 1.0.22.1
+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)
 PROG       = alsa
-PAK_VER    = 6
+PAK_VER    = 10
 
 DEPS       = ""
 
@@ -62,10 +59,10 @@ 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 = b28a12348905fb6915bc41f0edb2ecce
-alsa-utils-$(UVER).tar.bz2_MD5 = f7180316188552ee1e6759a03f1fe98d
-alsa-firmware-$(FVER).tar.bz2_MD5 = 75fe079c35c091cac49f3a60876bc26a
-alsa-driver-$(DVER).tar.bz2_MD5 = 8e516f2dca30acd0c4527632ef3fb36e
+$(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)
 
@@ -107,7 +104,7 @@ ifeq "$(KMOD)" "1"
        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) && ./configure
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2