X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Flibao%2FMakefile;h=a4e14a0e4947b443513afde9d97ecfbaeeec86fa;hb=9f46671c656813f6a5137848b35e99e4e9052c2f;hp=e23ee9ae86ec886220dcc9af7c7b44a0467b8a3f;hpb=ef6b16d4d51d0675261ede95d8e4e53ad73dfc9d;p=packages.git

diff --git a/libs/libao/Makefile b/libs/libao/Makefile
index e23ee9ae8..a4e14a0e4 100644
--- a/libs/libao/Makefile
+++ b/libs/libao/Makefile
@@ -1,24 +1,22 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libao
-PKG_VERSION:=0.8.6
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
-PKG_MD5SUM:=12e136a4c0995068ff134997c84421ed
-PKG_CAT:=zcat
+PKG_MD5SUM:=2b2508c29bc97e4dc218fa162cf883c8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,48 +25,38 @@ define Package/libao
   DEPENDS:=+alsa-lib
   CATEGORY:=Libraries
   TITLE:=A cross platform audio library
-  DESCRIPTION:=\
-	Libao is a cross-platform audio library that allows programs to \\\
-	output audio using a simple API on a wide variety of platforms.
   URL:=http://www.xiph.org/ao/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-esd \
-		--disable-arts \
-		--disable-nas \
-		--disable-polyp \
-	)
+define Package/libao/description
+	Libao is a cross-platform audio library that allows programs to
+	output audio using a simple API on a wide variety of platforms.
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-esd \
+	--disable-arts \
+	--disable-nas \
+	--disable-pulse
 
-define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/ao \
-		$(STAGING_DIR)/usr/lib/libao.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/ao.pc
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libao/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/ao/plugins-4
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ao/plugins-4/lib*.so $(1)/usr/lib/ao/plugins-4/
 endef
 
 $(eval $(call BuildPackage,libao))