[packages] alsa-lib: update to v1.0.21a (#5913)

[openwrt/svn-archive/archive.git] / libs / alsa-lib / Makefile

diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index 7c5386b2d21fac41f20273a9a6eb2b6d91f6930f..d2d9cf7d73833c29335d43bae0d37709f59e5127 100644 (file)
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -4,17 +4,20 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.21a
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/
-PKG_MD5SUM:=d55a9d7d2a79d738a1b7a511cffda4b6
+PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
+               http://alsa.cybermirror.org/lib/
+PKG_MD5SUM:=914685deb8c23cb4b940a4173cf8efe4
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,40 +40,55 @@ define Package/alsa-lib/description
  You must have enabled the ALSA support in the kernel.
 endef
 
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --disable-debugging \
-       --disable-profiling \
-       --with-softfloat \
-       --with-versioned=no \
+TARGET_CFLAGS += $(FPIC)
 
 define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
-
-define Build/Compile
-       # override AM_CFLAGS holding inappropriate optimization flags
-       $(MAKE) -C $(PKG_BUILD_DIR) AM_CFLAGS="" all
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+       $(call Build/Configure/Default, \
+           --enable-static \
+               --disable-python \
+               --disable-debug \
+               --without-debug \
+               $(SOFT_FLOAT_CONFIG_OPTION) \
+               --with-versioned=no \
+       )
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/alsa $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{la,a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/include/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/alsa \
+               $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libasound.{la,a,so*} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc \
+               $(1)/usr/lib/pkgconfig/
+
+       $(INSTALL_DIR) $(1)/usr/share/aclocal
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/aclocal/alsa.m4 \
+               $(1)/usr/share/aclocal/
 endef
 
 define Package/alsa-lib/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/share/alsa/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/alsa/alsa.conf $(1)/usr/share/alsa/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* \
+               $(1)/usr/lib/
+
+       $(INSTALL_DIR) $(1)/usr/share/alsa/{cards,pcm}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/alsa/alsa.conf \
+               $(1)/usr/share/alsa/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/alsa/pcm/* \
+               $(1)/usr/share/alsa/pcm/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/share/alsa/cards/* \
+               $(1)/usr/share/alsa/cards/
 endef
 
 $(eval $(call BuildPackage,alsa-lib))