From 0e982bcca6f6daff1da58e3d3f5e3e89bdc723ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 14:45:33 +0100 Subject: update to latest upstream --- package/sox/patches/patch-src_formats_c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'package/sox/patches/patch-src_formats_c') diff --git a/package/sox/patches/patch-src_formats_c b/package/sox/patches/patch-src_formats_c index fc298ba8e..da9a7ed28 100644 --- a/package/sox/patches/patch-src_formats_c +++ b/package/sox/patches/patch-src_formats_c @@ -1,20 +1,11 @@ ---- 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 +--- sox-14.4.1.orig/src/formats.c 2013-01-13 20:57:39.000000000 +0100 ++++ sox-14.4.1/src/formats.c 2014-03-29 14:43:56.000000000 +0100 +@@ -417,7 +417,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 - */ + * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE -+/* #error FIX NEEDED HERE */ ++ //#error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif -- cgit v1.2.3 From a1bfe2ccebcdfd8fb4a76a24dea3493ff53f14b5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 15:01:07 +0100 Subject: forgot the uclibc patch --- package/sox/patches/patch-src_formats_c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'package/sox/patches/patch-src_formats_c') diff --git a/package/sox/patches/patch-src_formats_c b/package/sox/patches/patch-src_formats_c index da9a7ed28..8ad23c63b 100644 --- a/package/sox/patches/patch-src_formats_c +++ b/package/sox/patches/patch-src_formats_c @@ -1,5 +1,14 @@ --- sox-14.4.1.orig/src/formats.c 2013-01-13 20:57:39.000000000 +0100 -+++ sox-14.4.1/src/formats.c 2014-03-29 14:43:56.000000000 +0100 ++++ sox-14.4.1/src/formats.c 2014-03-29 15:00:39.000000000 +0100 +@@ -409,7 +409,7 @@ static void UNUSED rewind_pipe(FILE * fp + #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ + fp->_p -= PIPE_AUTO_DETECT_SIZE; + fp->_r += PIPE_AUTO_DETECT_SIZE; +-#elif defined __GLIBC__ ++#elif defined __GLIBC__ && ! defined __UCLIBC__ + fp->_IO_read_ptr = fp->_IO_read_base; + #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H + fp->_ptr = fp->_base; @@ -417,7 +417,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 -- cgit v1.2.3