diff options
author | drochner <drochner@pkgsrc.org> | 2013-10-02 14:21:27 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2013-10-02 14:21:27 +0000 |
commit | 81c78bb261ced773a5bc3ffef1f74beb4d592c0a (patch) | |
tree | ac0eb17ab1666171e421bf1433e234f51a05af3d | |
parent | 1e4dfcfef752db693de83509d57a1aa0d291a4eb (diff) | |
download | pkgsrc-81c78bb261ced773a5bc3ffef1f74beb4d592c0a.tar.gz |
update to 14.4.1
changes:
-Re-enable file-type detection when reading from a pipe
-bugfixes
-rw-r--r-- | audio/sox/Makefile | 8 | ||||
-rw-r--r-- | audio/sox/distinfo | 10 | ||||
-rw-r--r-- | audio/sox/patches/patch-ak | 18 |
3 files changed, 16 insertions, 20 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile index cfdc6f738ee..65a9bad0b09 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2013/02/16 11:20:21 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2013/10/02 14:21:27 drochner Exp $ -DISTNAME= sox-14.4.0 -PKGREVISION= 1 +DISTNAME= sox-14.4.1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/} @@ -28,9 +27,6 @@ SUBST_FILES.gsm= configure src/gsm.c src/wav.c CMakeLists.txt SUBST_SED.gsm= -e "s!gsm/gsm.h!gsm.h!" SUBST_STAGE.gsm= pre-configure -post-install: - ${RMDIR} ${DESTDIR}${PREFIX}/lib/sox - .include "options.mk" .include "../../audio/flac/buildlink3.mk" diff --git a/audio/sox/distinfo b/audio/sox/distinfo index 348b4631ed8..d1797b8de3d 100644 --- a/audio/sox/distinfo +++ b/audio/sox/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.23 2012/12/18 14:42:29 jperkin Exp $ +$NetBSD: distinfo,v 1.24 2013/10/02 14:21:27 drochner Exp $ -SHA1 (sox-14.4.0.tar.gz) = d809cab382c7a9d015491c69051a9d1c1a1a44f1 -RMD160 (sox-14.4.0.tar.gz) = af1b6c02d29c988f9b0dfec9ca9ebb30949b0663 -Size (sox-14.4.0.tar.gz) = 1105756 bytes +SHA1 (sox-14.4.1.tar.gz) = 71f05afc51e3d9b03376b2f98fd452d3a274d595 +RMD160 (sox-14.4.1.tar.gz) = 2f3890ef1a2a7fe3ee8d819912b3b529e58986fe +Size (sox-14.4.1.tar.gz) = 1111653 bytes SHA1 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5 -SHA1 (patch-ak) = 1691ec39f3c96327f919388cd87b02fb6a99900b +SHA1 (patch-ak) = 46e2e23f7688201c1e4bcdce42982c7583fa0e5e diff --git a/audio/sox/patches/patch-ak b/audio/sox/patches/patch-ak index 1e3d6c849ff..a9e9ece55cb 100644 --- a/audio/sox/patches/patch-ak +++ b/audio/sox/patches/patch-ak @@ -1,12 +1,12 @@ -$NetBSD: patch-ak,v 1.2 2012/12/18 14:42:29 jperkin Exp $ +$NetBSD: patch-ak,v 1.3 2013/10/02 14:21:27 drochner Exp $ * On DragonFly, FILE is hidden, only allowed to modify in __FILE_public. * Disable file-type pipe detection on 64-bit Solaris. ---- src/formats.c.orig 2012-03-04 22:54:16.000000000 +0000 -+++ src/formats.c 2012-12-18 14:37:03.629252407 +0000 -@@ -406,17 +406,22 @@ +--- src/formats.c.orig 2013-01-13 19:57:39.000000000 +0000 ++++ src/formats.c +@@ -407,17 +407,22 @@ static void UNUSED rewind_pipe(FILE * fp /* _FSTDIO is for Torek stdio (i.e. most BSD-derived libc's) * In theory, we no longer need to check _NEWLIB_VERSION or __APPLE__ */ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ @@ -15,18 +15,18 @@ $NetBSD: patch-ak,v 1.2 2012/12/18 14:42:29 jperkin Exp $ + fpp->_p -= AUTO_DETECT_SIZE; + fpp->_r += AUTO_DETECT_SIZE; +# else - fp->_p -= AUTO_DETECT_SIZE; - fp->_r += AUTO_DETECT_SIZE; + fp->_p -= PIPE_AUTO_DETECT_SIZE; + fp->_r += PIPE_AUTO_DETECT_SIZE; +# endif #elif defined __GLIBC__ 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 __MINGW_H || (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) +-#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H ++#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) fp->_ptr = fp->_base; #else /* 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 #define NO_REWIND_PIPE (void)fp; |