diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2015-05-25 19:06:24 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2015-05-25 19:06:24 +0000 |
| commit | 03dc099d060589e573ba2eb0a71c31482a9ba054 (patch) | |
| tree | bb2e36d0871890706e6aa7190a0d807b40bbe246 /audio | |
| parent | 636119814b532ac14b7687ed593e30fc5d9d91c3 (diff) | |
| download | pkgsrc-03dc099d060589e573ba2eb0a71c31482a9ba054.tar.gz | |
Add patches to prevent a segfault when playing certain WAV files. From
Onno van der Linden in PR pkg/49929. Also submitted upstream.
Bump PKGREVISION.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/sox/Makefile | 3 | ||||
| -rw-r--r-- | audio/sox/distinfo | 4 | ||||
| -rw-r--r-- | audio/sox/patches/patch-src_oss.c | 14 | ||||
| -rw-r--r-- | audio/sox/patches/patch-src_sunaudio.c | 14 |
4 files changed, 33 insertions, 2 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 8ea63f87f4b..e0777d9123d 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2015/03/14 22:56:00 tnn Exp $ +# $NetBSD: Makefile,v 1.62 2015/05/25 19:06:24 bsiegert Exp $ DISTNAME= sox-14.4.2 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/} diff --git a/audio/sox/distinfo b/audio/sox/distinfo index c001fca918f..d34b113746c 100644 --- a/audio/sox/distinfo +++ b/audio/sox/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.25 2015/03/14 22:56:00 tnn Exp $ +$NetBSD: distinfo,v 1.26 2015/05/25 19:06:24 bsiegert Exp $ SHA1 (sox-14.4.2.tar.gz) = f69f38f8a7ad6a88ecab3862d74db4edcd796695 RMD160 (sox-14.4.2.tar.gz) = 2fd48904a7d8c7d85e194a001020901d061ced98 Size (sox-14.4.2.tar.gz) = 1134299 bytes SHA1 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5 SHA1 (patch-ak) = 28675f56a0e2969d0facd98282667c53eb10c0ed +SHA1 (patch-src_oss.c) = dca4dcf55d4bfa1da80b789cbddb48a9302e694b +SHA1 (patch-src_sunaudio.c) = 286ad890a32d69d499f76faa255473889b091d56 diff --git a/audio/sox/patches/patch-src_oss.c b/audio/sox/patches/patch-src_oss.c new file mode 100644 index 00000000000..8c51648b2e9 --- /dev/null +++ b/audio/sox/patches/patch-src_oss.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_oss.c,v 1.1 2015/05/25 19:06:24 bsiegert Exp $ + +Fix segfault when playing (PR pkg/49929). +--- src/oss.c.orig 2015-05-25 18:58:54.000000000 +0000 ++++ src/oss.c +@@ -369,7 +369,7 @@ static size_t osswrite( + size_t cbStride; + int cbWritten; + +- cStride = cInput; ++ cStride = cInputRemaining; + if (cStride > pPriv->cOutput) { + cStride = pPriv->cOutput; + } diff --git a/audio/sox/patches/patch-src_sunaudio.c b/audio/sox/patches/patch-src_sunaudio.c new file mode 100644 index 00000000000..143b07c81d3 --- /dev/null +++ b/audio/sox/patches/patch-src_sunaudio.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_sunaudio.c,v 1.1 2015/05/25 19:06:24 bsiegert Exp $ + +Fix segfault when playing (PR pkg/49929). +--- src/sunaudio.c.orig 2015-05-25 19:00:39.000000000 +0000 ++++ src/sunaudio.c +@@ -443,7 +443,7 @@ static size_t sunwrite( + size_t cbStride; + int cbWritten; + +- cStride = cInput; ++ cStride = cInputRemaining; + if (cStride > pPriv->cOutput) { + cStride = pPriv->cOutput; + } |