Received: by mail.netbsd.org (Postfix, from userid 605) id ED3FE84E00; Mon, 6 Nov 2017 19:16:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 775E284DCE for ; Mon, 6 Nov 2017 19:16:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id laahAATd3PRT for ; Mon, 6 Nov 2017 19:16:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EB8CD84D71 for ; Mon, 6 Nov 2017 19:16:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E28ECFBDE; Mon, 6 Nov 2017 19:16:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509995789225240" MIME-Version: 1.0 Date: Mon, 6 Nov 2017 19:16:29 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2017Q3] pkgsrc/multimedia/smpeg To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20171106191629.E28ECFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1509995789225240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Nov 6 19:16:29 UTC 2017 Modified Files: pkgsrc/multimedia/smpeg [pkgsrc-2017Q3]: distinfo Added Files: pkgsrc/multimedia/smpeg/patches [pkgsrc-2017Q3]: patch-audio_huffmantable.cpp Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.18.1 pkgsrc/multimedia/smpeg/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509995789225240 Content-Disposition: inline Content-Length: 2333 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/smpeg/distinfo diff -u pkgsrc/multimedia/smpeg/distinfo:1.8 pkgsrc/multimedia/smpeg/distinfo:1.8.18.1 --- pkgsrc/multimedia/smpeg/distinfo:1.8 Tue Nov 3 23:54:32 2015 +++ pkgsrc/multimedia/smpeg/distinfo Mon Nov 6 19:16:29 2017 @@ -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) = 8b4ef487dc7176dd0ef21e SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5 +SHA1 (patch-audio_huffmantable.cpp) = 4bde79539a6fe488bc6be7092f23fac18efa362e Added files: Index: pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp diff -u /dev/null pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp:1.1.2.2 --- /dev/null Mon Nov 6 19:16:29 2017 +++ pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp Mon Nov 6 19:16:29 2017 @@ -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 + #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}, --_----------=_1509995789225240--