aboutsummaryrefslogtreecommitdiffstats
path: root/main/sox/sox-uclibc.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-02-17 12:51:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-02-17 13:03:02 +0000
commit8d4950d3742f84d53b12cff41b90328d7dccc216 (patch)
treed57abd0f68d28c7d3849434fc2c5f153cada3ae0 /main/sox/sox-uclibc.patch
parent13e35e6d83e9638789e7fb6fd3f5193de627f719 (diff)
downloadaports-8d4950d3742f84d53b12cff41b90328d7dccc216.tar.bz2
aports-8d4950d3742f84d53b12cff41b90328d7dccc216.tar.xz
main/sox: upgrade to 14.4.1
Diffstat (limited to 'main/sox/sox-uclibc.patch')
-rw-r--r--main/sox/sox-uclibc.patch22
1 files changed, 10 insertions, 12 deletions
diff --git a/main/sox/sox-uclibc.patch b/main/sox/sox-uclibc.patch
index fb78cd0968..5f4ed4abbf 100644
--- a/main/sox/sox-uclibc.patch
+++ b/main/sox/sox-uclibc.patch
@@ -1,22 +1,20 @@
-diff --git a/src/formats.c b/src/formats.c
-index 556f611..6c2c5b0 100644
---- a/src/formats.c
-+++ b/src/formats.c
-@@ -395,7 +395,7 @@ static void UNUSED rewind_pipe(FILE * fp)
- #if defined _NEWLIB_VERSION || defined __APPLE__
- fp->_p -= AUTO_DETECT_SIZE;
- fp->_r += AUTO_DETECT_SIZE;
+--- ./src/formats.c.orig 2013-02-17 12:19:38.318344596 +0000
++++ ./src/formats.c 2013-02-17 12:50:31.560549872 +0000
+@@ -409,7 +409,7 @@
+ #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 __MINGW_H || defined _ISO_STDIO_ISO_H
+ #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H
fp->_ptr = fp->_base;
-@@ -403,7 +403,7 @@ static void UNUSED rewind_pipe(FILE * fp)
+@@ -417,7 +417,7 @@
/* 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