From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 2 Dec 2008 15:50:40 +0000 (+0000)
Subject: Okay, so this fixes Sox in  8.09 which has been very broken. This
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=4d191234adfc57b94a4fb5c6522aae2040c292d3;p=packages.git

Okay, so this fixes Sox in  8.09 which has been very broken. This
closes ticket #4275. I've included a patch which outputs to
/dev/sound/dsp on the 2.4 kernel series.

Note the versions of libflac and libid3tag in 8.09 *won't* compile
against this version of sox, so I've excluded them.

Libflac and libid3tag should be enabled in trunk I think, but there
are wider problems with some of the audio/musc related packages and
libraries being out of date and compiled without the right features
enabled, unused dependences, etc. I'm up to the task of fixing these
packages, but I'm new at working with audio-related software and
package maintenance so I may need some help or at least someone to bug
while I'm doing all of this.

Thanks,
Dave Cooper (kupesoft)

Signed-off-by: David Cooper <dave at kupesoft.com>


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

diff --git a/sound/sox/Makefile b/sound/sox/Makefile
index dc374e045..bf0d23a22 100644
--- a/sound/sox/Makefile
+++ b/sound/sox/Makefile
@@ -1,4 +1,5 @@
 # 
+# Copyright (C) 2008 David Cooper <dave@kupesoft.com>
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sox
 PKG_VERSION:=14.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/sox
@@ -21,10 +22,12 @@ PKG_BUILD_DEPENDS:=libnotimpl
 
 include $(INCLUDE_DIR)/package.mk
 
+# NOTE: libflac is out of date for 8.09's freeze and can't be compiled in
+
 define Package/sox
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libgsm
+  DEPENDS:=+libmad +libvorbis +libvorbisidec +libgsm
   TITLE:=Sox is a general purpose sound converter/player/recorder
   URL:=http://sox.sourceforge.net/
 endef
@@ -40,6 +43,8 @@ endef
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--disable-external-gsm \
+		--without-libltdl \
+		--with-ogg \
 		, \
 		LIBS="-lnotimpl -lm" \
 	)
@@ -49,12 +54,15 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		STAGING_DIR="$(STAGING_DIR)" \
-		all
+		all install
 endef
 
 define Package/sox/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/src/{play,sox} $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{play,rec,sox} $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libsfx.so*,libsox.so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,sox))
+