libaudiofile: update to 0.2.7

SVN-Revision: 21020

diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile
index 0a91b07c1b94a883aa07c6d764f5586a1d1dc0cb..7cb77938729cea36b0b6ba26b78b67a41609640d 100644 (file)
--- a/libs/libaudiofile/Makefile
+++ b/libs/libaudiofile/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,19 +7,21 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libaudiofile
-PKG_VERSION:=0.2.6
-PKG_RELEASE:=2
+PKG_NAME:=audiofile
+PKG_VERSION:=0.2.7
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
-PKG_MD5SUM:=460f848ce5f4a33ae66b15a4fb7720ec
+PKG_SOURCE_URL:= \
+       http://github.com/downloads/mpruett/audiofile/ \
+       http://www.68k.org/~michael/audiofile/
+PKG_MD5SUM:=a39be317a7b1971b408805dc5e371862
+
 PKG_FIXUP:=libtool
+PKG_INSTALL=1
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL=1
-
 define Package/libaudiofile
   SECTION:=libs
   CATEGORY:=Libraries
@@ -28,24 +30,21 @@ define Package/libaudiofile
 endef
 
 define Package/libaudiofile/description
-       The audiofile library allows the processing of audio data to and from audio 
-       files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS, 
-       and raw data).
+ The audiofile library allows the processing of audio data to and from audio 
+ files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS, 
+ and raw data).
 endef
 
-TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS+= \
+       --enable-shared \
+       --enable-static \
+       --with-build-cc="$(HOSTCC)" \
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --with-build-cc="$(HOSTCC)" \
-       )
-endef
+TARGET_CFLAGS+= $(FPIC) -std=c99
 
 define Build/InstallDev
        $(INSTALL_DIR) $(2)/bin
-       $(INSTALL_BIN) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/bin/audiofile-config \
                $(2)/bin/
        $(SED) \
@@ -53,7 +52,7 @@ define Build/InstallDev
                $(2)/bin/audiofile-config
 
        $(INSTALL_DIR) $(1)/usr/include
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/include/{af_vfs,audiofile,aupvlist}.h \
                $(1)/usr/include/
 
@@ -63,7 +62,7 @@ define Build/InstallDev
                $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc \
                $(1)/usr/lib/pkgconfig/
 endef

diff --git a/libs/libaudiofile/patches/001-audiofile-config-libdirs.patch b/libs/libaudiofile/patches/001-audiofile-config-libdirs.patch
index ba92d7d4ef48fef739463d8272597c44888e0542..209225e1c4af2119f55e6d35339241d212649793 100644 (file)
--- a/libs/libaudiofile/patches/001-audiofile-config-libdirs.patch
+++ b/libs/libaudiofile/patches/001-audiofile-config-libdirs.patch
@@ -1,6 +1,6 @@
---- libaudiofile-0.2.6/audiofile-config.in.orig        2004-03-06 07:39:23.000000000 +0100
-+++ libaudiofile-0.2.6/audiofile-config.in     2005-12-13 14:15:52.000000000 +0100
-@@ -45,7 +45,9 @@
+--- a/audiofile-config.in
++++ b/audiofile-config.in
+@@ -45,7 +45,9 @@ while test $# -gt 0; do
        echo $includes
        ;;
      --libs)