diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-03 20:04:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-03 20:04:42 +0100 |
| commit | d5d04ed4a7ce7305d963ba71fe040cab8b49d617 (patch) | |
| tree | 5421dd53b102529d38466deae8178f9ef112b727 | |
| parent | 832be8425b55a47c0b8e9d493df1ae81dbe61dd4 (diff) | |
| parent | 5dfc2c374f16873890ba7a0be1928ee55fef8587 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/sox/Makefile | 2 | ||||
| -rw-r--r-- | package/sox/patches/patch-src_formats_c | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/package/sox/Makefile b/package/sox/Makefile index 012468e24..fd546e146 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sox PKG_VERSION:= 14.3.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b99871c7bbae84feac9d0d1f010331ba PKG_DESCR:= Swiss Army knife of sound processing programs PKG_SECTION:= multimedia diff --git a/package/sox/patches/patch-src_formats_c b/package/sox/patches/patch-src_formats_c new file mode 100644 index 000000000..fc298ba8e --- /dev/null +++ b/package/sox/patches/patch-src_formats_c @@ -0,0 +1,20 @@ +--- sox-14.3.1.orig/src/formats.c 2010-01-02 01:07:28.000000000 +0100 ++++ sox-14.3.1/src/formats.c 2011-03-01 22:15:05.000000000 +0100 +@@ -399,7 +399,7 @@ static void UNUSED rewind_pipe(FILE * fp + #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ + fp->_p -= AUTO_DETECT_SIZE; + fp->_r += AUTO_DETECT_SIZE; +-#elif defined __GLIBC__ ++#elif defined __GLIBC__ && ! defined __UCLIBC__ + fp->_IO_read_ptr = fp->_IO_read_base; + #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H + fp->_ptr = fp->_base; +@@ -407,7 +407,7 @@ static void UNUSED rewind_pipe(FILE * fp + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.au | ./sox --info - */ +- #error FIX NEEDED HERE ++/* #error FIX NEEDED HERE */ + #define NO_REWIND_PIPE + (void)fp; + #endif |