Control: tags 811742 + patch Control: tags 811742 + pending Dear maintainer,
I've prepared an NMU for smpeg (versioned as 0.4.5+cvs20030824-7.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru smpeg-0.4.5+cvs20030824/debian/changelog smpeg-0.4.5+cvs20030824/debian/changelog --- smpeg-0.4.5+cvs20030824/debian/changelog 2014-08-31 00:21:03.000000000 +0200 +++ smpeg-0.4.5+cvs20030824/debian/changelog 2016-09-24 20:30:31.000000000 +0200 @@ -1,3 +1,10 @@ +smpeg (0.4.5+cvs20030824-7.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation with GCC 6. (Closes: #811742) + + -- Johannes Brandstätter <jbran...@2ds.eu> Sat, 24 Sep 2016 20:30:31 +0200 + smpeg (0.4.5+cvs20030824-7.1) unstable; urgency=medium * Non-maintainer upload with maintainer permission. Thanks! diff -Nru smpeg-0.4.5+cvs20030824/debian/patches/340_gcc6.diff smpeg-0.4.5+cvs20030824/debian/patches/340_gcc6.diff --- smpeg-0.4.5+cvs20030824/debian/patches/340_gcc6.diff 1970-01-01 01:00:00.000000000 +0100 +++ smpeg-0.4.5+cvs20030824/debian/patches/340_gcc6.diff 2016-09-24 20:30:28.000000000 +0200 @@ -0,0 +1,40 @@ +Description: Fix compiling with GCC 6. +Author: Johannes Brandstätter <jbran...@2ds.eu> +Bug-Debian: https://bugs.debian.org/811742 +Last-Update: <2016-09-24> + +Index: smpeg-0.4.5+cvs20030824/audio/huffmantable.cpp +=================================================================== +--- smpeg-0.4.5+cvs20030824.orig/audio/huffmantable.cpp ++++ smpeg-0.4.5+cvs20030824/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}, diff -Nru smpeg-0.4.5+cvs20030824/debian/patches/series smpeg-0.4.5+cvs20030824/debian/patches/series --- smpeg-0.4.5+cvs20030824/debian/patches/series 2014-08-31 00:13:12.000000000 +0200 +++ smpeg-0.4.5+cvs20030824/debian/patches/series 2016-09-24 20:25:18.000000000 +0200 @@ -13,3 +13,4 @@ 310_deprecate_flags.diff 320_gnu_stack.diff 330_format_security.diff +340_gcc6.diff
signature.asc
Description: PGP signature
