CVS commit: pkgsrc/audio/mp3blaster

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   christos
Date:           Wed Apr 18 00:40:47 UTC 2018

Modified Files:
        pkgsrc/audio/mp3blaster: Makefile distinfo
Added Files:
        pkgsrc/audio/mp3blaster/patches: patch-mpegsound_huffmantable.cc

Log Message:
upgrade to latest and make this work with gcc-6


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/audio/mp3blaster/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/mp3blaster/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/mp3blaster/patches/patch-mpegsound_huffmantable.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mp3blaster/Makefile
diff -u pkgsrc/audio/mp3blaster/Makefile:1.37 pkgsrc/audio/mp3blaster/Makefile:1.38
--- pkgsrc/audio/mp3blaster/Makefile:1.37       Wed Apr 20 08:10:29 2016
+++ pkgsrc/audio/mp3blaster/Makefile    Tue Apr 17 20:40:47 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2016/04/20 12:10:29 nros Exp $
+# $NetBSD: Makefile,v 1.38 2018/04/18 00:40:47 christos Exp $
 
-DISTNAME=      mp3blaster-3.2.5
-PKGREVISION=   6
+DISTNAME=      mp3blaster-3.2.6
+#PKGREVISION=  6
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mp3blaster/}
 

Index: pkgsrc/audio/mp3blaster/distinfo
diff -u pkgsrc/audio/mp3blaster/distinfo:1.13 pkgsrc/audio/mp3blaster/distinfo:1.14
--- pkgsrc/audio/mp3blaster/distinfo:1.13       Mon Nov  2 20:12:41 2015
+++ pkgsrc/audio/mp3blaster/distinfo    Tue Apr 17 20:40:47 2018
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:12:41 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/04/18 00:40:47 christos Exp $
 
-SHA1 (mp3blaster-3.2.5.tar.gz) = 6a0fc892e0739a409735e85b18089c0e25fcc577
-RMD160 (mp3blaster-3.2.5.tar.gz) = 8aca362a6212a93cad26e428480b233766b1888b
-SHA512 (mp3blaster-3.2.5.tar.gz) = 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e
-Size (mp3blaster-3.2.5.tar.gz) = 329407 bytes
+SHA1 (mp3blaster-3.2.6.tar.gz) = bf07498a64c0ebf904d56ab6ed1ab28275f59f61
+RMD160 (mp3blaster-3.2.6.tar.gz) = ceebc80640bacfb2cb7e9b08ea1732c95a2fcd0f
+SHA512 (mp3blaster-3.2.6.tar.gz) = eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d
+Size (mp3blaster-3.2.6.tar.gz) = 354019 bytes
+SHA1 (patch-mpegsound_huffmantable.cc) = 19be1c0d6ec368f8bbea500cc347ea4d9d5f24e9
 SHA1 (patch-src_global.cc) = e227d0fe62e2f6e8f7f24280634a59b31f629b24
 SHA1 (patch-src_main.cc) = 2befe04576dcd4e046aa0e155c8fbf130d6bc6e0

Added files:

Index: pkgsrc/audio/mp3blaster/patches/patch-mpegsound_huffmantable.cc
diff -u /dev/null pkgsrc/audio/mp3blaster/patches/patch-mpegsound_huffmantable.cc:1.1
--- /dev/null   Tue Apr 17 20:40:47 2018
+++ pkgsrc/audio/mp3blaster/patches/patch-mpegsound_huffmantable.cc     Tue Apr 17 20:40:47 2018
@@ -0,0 +1,29 @@
+$NetBSD: patch-mpegsound_huffmantable.cc,v 1.1 2018/04/18 00:40:47 christos Exp $
+
+Handle gcc-6 negative constant warning
+
+--- mpegsound/huffmantable.cc.orig     2014-11-03 22:36:33.000000000 -0500
++++ mpegsound/huffmantable.cc  2018-04-17 20:38:46.175637687 -0400
+@@ -550,11 +550,11 @@
+ 
+ const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, ~0U, ~0U, 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, ~0U, ~0U, 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 +564,7 @@
+   {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, ~0U, ~0U, 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},