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 <[EMAIL PROTECTED]>

Index: packages/sound/sox/patches/010-dev-sound-dsp.patch
===================================================================
--- packages/sound/sox/patches/010-dev-sound-dsp.patch  (revision 0)
+++ packages/sound/sox/patches/010-dev-sound-dsp.patch  (revision 0)
@@ -0,0 +1,26 @@
+diff -ruN sox-14.0.1.orig/src/sox.c sox-14.0.1/src/sox.c
+--- sox-14.0.1.orig/src/sox.c  2008-01-28 17:47:19.000000000 -0500
++++ sox-14.0.1/src/sox.c       2008-12-01 05:49:29.000000000 -0500
+@@ -62,6 +62,7 @@
+   #define TIME_FRAC 1e3
+ #endif
+
++#include <linux/version.h>
+
+ /* argv[0] options */
+
+@@ -377,7 +378,13 @@
+   if (sox_find_format("ossdsp", sox_false))
+   {
+     f->filetype = "ossdsp";
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++    f->filename = xstrdup("/dev/sound/dsp");
++#else
+     f->filename = xstrdup("/dev/dsp");
++#endif
++
+     return;
+   }
+ #endif
+
Index: packages/sound/sox/Makefile
===================================================================
--- packages/sound/sox/Makefile (revision 13456)
+++ packages/sound/sox/Makefile (working copy)
@@ -1,4 +1,5 @@
 #
+# Copyright (C) 2008 David Cooper <[EMAIL PROTECTED]>
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,7 +11,7 @@

 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:[EMAIL PROTECTED]/sox
@@ -21,10 +22,12 @@

 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 @@
 define Build/Configure
       $(call Build/Configure/Default, \
               --disable-external-gsm \
+               --without-libltdl \
+               --with-ogg \
               , \
               LIBS="-lnotimpl -lm" \
       )
@@ -49,12 +54,15 @@
       $(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))
+
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to