From 010437d22053211279c3659312365ec8ac638f55 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 22 Oct 2006 21:09:15 +0000
Subject: [PATCH] update alsa-lib to v1.0.13, add pkgconfig/alsa.pc,
 standardize

SVN-Revision: 5259
---
 libs/alsa-lib/Makefile | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index d27caf0d09..f8294f6a88 100644
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -4,20 +4,20 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.13
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/
-PKG_MD5SUM:=ef7ae78a0ef08cbeacb295f2518886ab
+PKG_MD5SUM:=d55a9d7d2a79d738a1b7a511cffda4b6
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,14 +26,15 @@ define Package/alsa-lib
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+alsa
-  TITLE:=Advanced Linux Sound Architecture Library
-  DESCRIPTION:=This is the library package for alsa, needed by some userspace programs. You must\\\
-  	have enabled the ALSA support in the kernel.
+  TITLE:=ALSA (Advanced Linux Sound Architecture) library
+  DESCRIPTION:=\
+	This is the library package for alsa, needed by some userspace programs. You must \\\
+	have enabled the ALSA support in the kernel.
   URL:=http://www.alsa-project.org/
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,\
+	$(call Build/Configure/Default,\
 		--enable-shared=yes \
 		--enable-static=yes \
 		--with-gnu-ld \
@@ -41,18 +42,13 @@ $(call Build/Configure/Default,\
 		--disable-profiling \
 		--with-softfloat \
 		--with-versioned=no \
-)
+	)
 endef
 
 define Build/Compile
-$(call Build/Compile/Default,\
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install)
-endef
-
-define Package/alsa-lib/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* $(1)/usr/lib/
+		all install
 endef
 
 define Build/InstallDev
@@ -60,12 +56,23 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/alsa $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{a,so}* $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/alsa,,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
+	$(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
+	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
 endef
 
 define Build/UninstallDev
 	rm -rf \
 		$(STAGING_DIR)/usr/include/alsa \
-		$(STAGING_DIR)/usr/lib/libasound.{a,so}*
+		$(STAGING_DIR)/usr/lib/libasound.{a,so}* \
+		$(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
+endef
+
+define Package/alsa-lib/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,alsa-lib))
-- 
2.30.2