From e27a5a2a4783dc65ea091002bdef32ff8dead337 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 3 Nov 2013 17:13:07 +0100
Subject: update to latest upstream

---
 package/libao/Makefile                | 17 +++++++++--------
 package/libao/patches/patch-ltmain_sh | 11 -----------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 package/libao/patches/patch-ltmain_sh

(limited to 'package/libao')

diff --git a/package/libao/Makefile b/package/libao/Makefile
index 8d90091f3..58b4cbfa7 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libao
-PKG_VERSION:=		0.8.8
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		b92cba3cbcf1ee9bc221118a85d23dcd
+PKG_VERSION:=		1.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2b2508c29bc97e4dc218fa162cf883c8
 PKG_DESCR:=		A cross platform audio library
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libesd
-PKG_BUILDDEP:=		esound
+PKG_DEPENDS:=		libesd alsa-lib
+PKG_BUILDDEP:=		esound alsa-lib
 PKG_URL:=		http://www.xiph.org/ao
 PKG_SITES:=		http://downloads.xiph.org/releases/ao/
 PKG_OPTS:=		dev
@@ -20,14 +20,15 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-esd \
+			--enable-alsa \
 			--disable-arts \
 			--disable-nas \
 			--disable-polyp
 
 libao-install:
-	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-2
+	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-4
 	${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \
-		${IDIR_LIBAO}/usr/lib/ao/plugins-2
+	${CP} ${WRKINST}/usr/lib/ao/plugins-4/*.so \
+		${IDIR_LIBAO}/usr/lib/ao/plugins-4
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libao/patches/patch-ltmain_sh b/package/libao/patches/patch-ltmain_sh
deleted file mode 100644
index 393127801..000000000
--- a/package/libao/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libao-0.8.8.orig/ltmain.sh	2007-02-21 12:45:54.000000000 +0100
-+++ libao-0.8.8/ltmain.sh	2011-01-15 22:34:13.000000000 +0100
-@@ -1677,7 +1677,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
-- 
cgit v1.2.3