diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-29 14:45:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-29 14:45:33 +0100 |
| commit | 0e982bcca6f6daff1da58e3d3f5e3e89bdc723ab (patch) | |
| tree | aee9986e2cb8da25f99322b7ae58c314c7e18066 | |
| parent | a47f1c5bff1fab6d622ac3d440f62cb4f6cdcc3a (diff) | |
update to latest upstream
| -rw-r--r-- | package/sox/Makefile | 6 | ||||
| -rw-r--r-- | package/sox/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/sox/patches/patch-src_formats_c | 19 |
3 files changed, 8 insertions, 28 deletions
diff --git a/package/sox/Makefile b/package/sox/Makefile index 2f5436146..5072bca01 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sox -PKG_VERSION:= 14.3.2 +PKG_VERSION:= 14.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= e9d35cf3b0f8878596e0b7c49f9e8302 -PKG_DESCR:= Swiss Army knife of sound processing programs +PKG_MD5SUM:= 670307f40763490a2bc0d1f322071e7a +PKG_DESCR:= swiss army knife of sound processing programs PKG_SECTION:= multimedia PKG_BUILDDEP:= zlib libmad lame alsa-lib libid3tag PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag diff --git a/package/sox/patches/patch-ltmain_sh b/package/sox/patches/patch-ltmain_sh deleted file mode 100644 index 722e3e762..000000000 --- a/package/sox/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- sox-14.3.2.orig/ltmain.sh 2011-01-04 06:04:29.000000000 +0100 -+++ sox-14.3.2/ltmain.sh 2011-03-06 00:04:37.000000000 +0100 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" 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 |