diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-12-18 14:42:29 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-12-18 14:42:29 +0000 |
| commit | 675c56e8d28208580843112e297b01e05a3e5aa2 (patch) | |
| tree | 12fe52583d14a5679883f95635c5254da900463f /audio | |
| parent | f4bc4cc16b05d6fd15e68f5af22ad57c9bedbc64 (diff) | |
| download | pkgsrc-675c56e8d28208580843112e297b01e05a3e5aa2.tar.gz | |
On 64-bit Solaris FILE is an opaque type, disable the rewind functionality.
Fixes package build.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/sox/distinfo | 4 | ||||
| -rw-r--r-- | audio/sox/patches/patch-ak | 22 |
2 files changed, 19 insertions, 7 deletions
diff --git a/audio/sox/distinfo b/audio/sox/distinfo index 94ad4db6c44..348b4631ed8 100644 --- a/audio/sox/distinfo +++ b/audio/sox/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.22 2012/07/04 09:27:37 adam Exp $ +$NetBSD: distinfo,v 1.23 2012/12/18 14:42:29 jperkin 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 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5 -SHA1 (patch-ak) = 806771b7f7f3e46c28036f9414f8e27b893813c2 +SHA1 (patch-ak) = 1691ec39f3c96327f919388cd87b02fb6a99900b diff --git a/audio/sox/patches/patch-ak b/audio/sox/patches/patch-ak index 76dc6fadaaf..1e3d6c849ff 100644 --- a/audio/sox/patches/patch-ak +++ b/audio/sox/patches/patch-ak @@ -1,10 +1,12 @@ -$NetBSD: patch-ak,v 1.1 2010/12/27 05:32:49 obache Exp $ +$NetBSD: patch-ak,v 1.2 2012/12/18 14:42:29 jperkin Exp $ * On DragonFly, FILE is hidden, only allowed to modify in __FILE_public. ---- src/formats.c.orig 2010-01-02 00:07:28.000000000 +0000 -+++ src/formats.c -@@ -397,8 +397,14 @@ static void UNUSED rewind_pipe(FILE * fp +* 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 @@ /* _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__ @@ -18,4 +20,14 @@ $NetBSD: patch-ak,v 1.1 2010/12/27 05:32:49 obache Exp $ +# 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 ++#elif defined _MSC_VER || defined __MINGW_H || (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 - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif |