Thu Oct 19 15:59:22 2017 UTC ()

smpeg: Fix build with GCC >= 6, from various.


(jperkin)

diff -r1.8 -r1.9 pkgsrc/multimedia/smpeg/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp

--- pkgsrc/multimedia/smpeg/distinfo 2015/11/03 23:54:32 1.8
+++ pkgsrc/multimedia/smpeg/distinfo 2017/10/19 15:59:22 1.9

 @@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:54:32 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/10/19 15:59:22 jperkin Exp $
 SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
 RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7
 SHA512 (smpeg-0.4.4.tar.gz) = d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
 Size (smpeg-0.4.4.tar.gz) = 315054 bytes
 SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
 SHA1 (patch-ab) = 8b4ef487dc7176dd0ef21e9a6d90e72e26d68c73
 SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab
 SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa
 SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5
 SHA1 (patch-audio_huffmantable.cpp) = 4bde79539a6fe488bc6be7092f23fac18efa362e

$NetBSD: patch-audio_huffmantable.cpp,v 1.1 2017/10/19 15:59:22 jperkin 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},