Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

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

diff --git a/lfs/alsa b/lfs/alsa
index 113eaca23749b999c1e62fca0f1d650f89317455..f6f6df8046fe6eaf08b931d6c90342aee0798884 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,27 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
 ifeq "$(XEN)" "1"
        VERSUFIX=ipfire-xen
 else
        VERSUFIX=ipfire
 endif
+endif
 
-VER        = 1.0.22
-UVER       = 1.0.22
-FVER       = 1.0.20
-DVER       = 1.0.22
+VER        = 1.0.24.1
+UVER       = 1.0.24.2
+FVER       = 1.0.24.1
+DVER       = 1.0.24
 
 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    = 9
 
 DEPS       = ""
 
@@ -62,10 +66,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 = 3ad66ab5f3d0b7174a1ddacff38c8c70
+$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226
+alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2
+alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b
+alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e
 
 install : $(TARGET)