Update sox to 14.0.1, soxmix is removed upstream, add libgsm dependency (#3616)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11828 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/sound/sox/Makefile b/sound/sox/Makefile
index 269221b..ccd7f42 100644 (file)
--- a/sound/sox/Makefile
+++ b/sound/sox/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sox
-PKG_VERSION:=12.18.2
+PKG_VERSION:=14.0.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/sox
-PKG_MD5SUM:=ba25e512a6c824d6e56d76767a18af99
+PKG_MD5SUM:=6c95af60b20b9655531bf3162c0be937
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sox
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec
+  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libgsm
   TITLE:=Sox is a general purpose sound converter/player/recorder
   URL:=http://sox.sourceforge.net/
 endef
@@ -56,7 +56,7 @@ endef
 
 define Package/sox/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_BUILD_DIR)/src/{play,sox,soxmix} $(1)/usr/bin/
+       $(CP) $(PKG_BUILD_DIR)/src/{play,sox} $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,sox))

diff --git a/sound/sox/patches/001-cross_compile.patch b/sound/sox/patches/001-cross_compile.patch
new file mode 100644 (file)
index 0000000..5f80451
--- /dev/null
+++ b/sound/sox/patches/001-cross_compile.patch
@@ -0,0 +1,30 @@
+diff -urN sox-14.0.1/src/Makefile.am sox-14.0.1.new/src/Makefile.am
+--- sox-14.0.1/src/Makefile.am 2008-01-14 04:40:59.000000000 +0100
++++ sox-14.0.1.new/src/Makefile.am     2008-07-14 14:14:37.000000000 +0200
+@@ -288,10 +288,9 @@
+ 
+ EXTRA_DIST = tests.sh testall.sh tests.bat testall.bat monkey.au monkey.wav sox_sample_test.c amr-wb-test CMakeLists.txt soxstdint.h.cmake soxconfig.h.cmake example1.c
+ 
+-all: sox$(EXEEXT) play rec sox_sample_test$(EXEEXT) example1$(EXEEXT)
++all: sox$(EXEEXT) play rec
+ 
+ play rec: sox$(EXEEXT)
+-      ./sox --help > /dev/null
+       test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@
+ 
+ install-exec-hook:
+diff -urN sox-14.0.1/src/Makefile.in sox-14.0.1.new/src/Makefile.in
+--- sox-14.0.1/src/Makefile.in 2008-01-28 23:47:49.000000000 +0100
++++ sox-14.0.1.new/src/Makefile.in     2008-07-14 14:15:12.000000000 +0200
+@@ -2426,10 +2426,9 @@
+       uninstall-libLTLIBRARIES uninstall-pkglibLTLIBRARIES
+ 
+ 
+-all: sox$(EXEEXT) play rec sox_sample_test$(EXEEXT) example1$(EXEEXT)
++all: sox$(EXEEXT) play rec 
+ 
+ play rec: sox$(EXEEXT)
+-      ./sox --help > /dev/null
+       test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@
+ 
+ install-exec-hook: