diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2017-11-06 19:16:29 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2017-11-06 19:16:29 +0000 |
| commit | fdc51509b73a370b4a2ef78f2e09a06eb9f6b550 (patch) | |
| tree | 523925384f5c297c6c6f7cc8b903e4b12d69295c | |
| parent | 2f643a4c8fd27a5cb6a71283a31a8b25cbb9ddfe (diff) | |
| download | pkgsrc-fdc51509b73a370b4a2ef78f2e09a06eb9f6b550.tar.gz | |
Pullup ticket #5606 - requested by sevan
multimedia/smpeg: build fix
Revisions pulled up:
- multimedia/smpeg/distinfo 1.9
- multimedia/smpeg/patches/patch-audio_huffmantable.cpp 1.1
---
Module Name: pkgsrc
Committed By: jperkin
Date: Thu Oct 19 15:59:22 UTC 2017
Modified Files:
pkgsrc/multimedia/smpeg: distinfo
Added Files:
pkgsrc/multimedia/smpeg/patches: patch-audio_huffmantable.cpp
Log Message:
smpeg: Fix build with GCC >= 6, from various.
| -rw-r--r-- | multimedia/smpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/smpeg/patches/patch-audio_huffmantable.cpp | 37 |
2 files changed, 39 insertions, 1 deletions
diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo index abb4746ad51..926172f334b 100644 --- a/multimedia/smpeg/distinfo +++ b/multimedia/smpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:32 agc Exp $ +$NetBSD: distinfo,v 1.8.18.1 2017/11/06 19:16:29 bsiegert Exp $ SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259 RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7 @@ -9,3 +9,4 @@ SHA1 (patch-ab) = 8b4ef487dc7176dd0ef21e9a6d90e72e26d68c73 SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5 +SHA1 (patch-audio_huffmantable.cpp) = 4bde79539a6fe488bc6be7092f23fac18efa362e diff --git a/multimedia/smpeg/patches/patch-audio_huffmantable.cpp b/multimedia/smpeg/patches/patch-audio_huffmantable.cpp new file mode 100644 index 00000000000..67b76e3dce8 --- /dev/null +++ b/multimedia/smpeg/patches/patch-audio_huffmantable.cpp @@ -0,0 +1,37 @@ +$NetBSD: patch-audio_huffmantable.cpp,v 1.1.2.2 2017/11/06 19:16:29 bsiegert Exp $ + +Fix build with GCC >= 6. + +--- audio/huffmantable.cpp.orig 1999-08-26 04:37:52.000000000 +0000 ++++ audio/huffmantable.cpp +@@ -9,6 +9,7 @@ + #include "config.h" + #endif + ++#include <climits> + #include "MPEGaudio.h" + + static const unsigned int +@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, + + const HUFFMANCODETABLE MPEGaudio::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, |