Control: tags -1 pending Hi,
On Mon, 28 May 2018 20:24:23 +0100 James Cowgill <jcowg...@debian.org> wrote: > Control: tags -1 patch > > Hi, > > On Wed, 24 Jan 2018 22:26:50 +0000 jcowg...@debian.org wrote: > > Source: moc > > Version: 1:2.6.0~svn-r2949-2 > > Severity: important > > User: debian-multime...@lists.debian.org > > Usertags: ffmpeg-3.5-transition > > > > Hi, > > > > Your package FTBFS with the upcoming version 3.5 of FFmpeg. > > The attached patch fixes this. I've uploaded the attached NMU (based on my previously posted patch) to DELAYED/5. Please tell me if I should cancel it. James
diff -Nru moc-2.6.0~svn-r2949/debian/changelog moc-2.6.0~svn-r2949/debian/changelog --- moc-2.6.0~svn-r2949/debian/changelog 2017-06-19 20:45:41.000000000 +0100 +++ moc-2.6.0~svn-r2949/debian/changelog 2018-07-17 11:20:03.000000000 +0100 @@ -1,3 +1,10 @@ +moc (1:2.6.0~svn-r2949-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Fix FTBFS with FFmpeg 4.0. (Closes: #888353) + + -- James Cowgill <jcowg...@debian.org> Tue, 17 Jul 2018 11:20:03 +0100 + moc (1:2.6.0~svn-r2949-2) unstable; urgency=medium * Set LC_MESSAGES=en_DK.utf8 to generate upstreams changelog via svn log. diff -Nru moc-2.6.0~svn-r2949/debian/patches/05_ffmpeg4.patch moc-2.6.0~svn-r2949/debian/patches/05_ffmpeg4.patch --- moc-2.6.0~svn-r2949/debian/patches/05_ffmpeg4.patch 1970-01-01 01:00:00.000000000 +0100 +++ moc-2.6.0~svn-r2949/debian/patches/05_ffmpeg4.patch 2018-07-17 11:19:42.000000000 +0100 @@ -0,0 +1,36 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: James Cowgill <jcowg...@debian.org> +Bug-Debian: https://bugs.debian.org/888353 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/decoder_plugins/ffmpeg/ffmpeg.c ++++ b/decoder_plugins/ffmpeg/ffmpeg.c +@@ -697,7 +697,7 @@ static void *ffmpeg_open_internal (struc + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -705,8 +705,8 @@ static void *ffmpeg_open_internal (struc + } + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) + { +@@ -725,7 +725,7 @@ static void *ffmpeg_open_internal (struc + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); diff -Nru moc-2.6.0~svn-r2949/debian/patches/series moc-2.6.0~svn-r2949/debian/patches/series --- moc-2.6.0~svn-r2949/debian/patches/series 2017-06-19 20:45:41.000000000 +0100 +++ moc-2.6.0~svn-r2949/debian/patches/series 2018-07-17 11:20:03.000000000 +0100 @@ -1,3 +1,4 @@ 0001-Refreshed-opus-patch-from-Tomasz-Golinski-tomaszg-al.patch 0002-Adapted-the-opus-patch-to-config.example.in.patch 04_playtime_perc.patch +05_ffmpeg4.patch
signature.asc
Description: OpenPGP digital signature
