Bug#888353: moc: FTBFS with FFmpeg 4.0

2018-07-19 Thread Elimar Riesebieter 
* James Cowgill  [2018-07-19 18:32 +0100]:

> Hi,
> 
> On 19/07/18 18:05, Elimar Riesebieter wrote:
[...] 
> My patch hasn't been uploaded to unstable yet, so you can ignore those
> logs. It's still in deferred [1,2].
> 
> [1] https://ftp-master.debian.org/deferred.html
> [2] https://ftp-master.debian.org/deferred/
> 
> > I can prepare a tuned patch with upstream over the weekend and upload
> > next week via mentors.debian.net.
> 
> Do you want me to cancel my NMU? Can I just upload it now?

OK, please upload. Nevertheless I'll keep on tuning together with
upstream.

Thanks for contribution!

Elimar
-- 
  Experience is something you don't get until
  just after you need it!


signature.asc
Description: PGP signature

Bug#888353: moc: FTBFS with FFmpeg 4.0

2018-07-19 Thread James Cowgill 
Hi,

On 19/07/18 18:05, Elimar Riesebieter wrote:
> * James Cowgill  [2018-07-17 11:36 +0100]:
>> On Mon, 28 May 2018 20:24:23 +0100 James Cowgill 
>> wrote:
>>> On Wed, 24 Jan 2018 22:26:50 + jcowg...@debian.org wrote:
 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.
> 
> It seems that your patch doesn't build. Check the logs at [0].
> 
> [0] https://buildd.debian.org/status/package.php?p=moc=unstable

My patch hasn't been uploaded to unstable yet, so you can ignore those
logs. It's still in deferred [1,2].

[1] https://ftp-master.debian.org/deferred.html
[2] https://ftp-master.debian.org/deferred/

> I can prepare a tuned patch with upstream over the weekend and upload
> next week via mentors.debian.net.

Do you want me to cancel my NMU? Can I just upload it now?

James



signature.asc
Description: OpenPGP digital signature

Bug#888353: moc: FTBFS with FFmpeg 4.0

2018-07-19 Thread Elimar Riesebieter 
* James Cowgill  [2018-07-17 11:36 +0100]:

> Control: tags -1 pending
> 
> Hi,
> 
> On Mon, 28 May 2018 20:24:23 +0100 James Cowgill 
> wrote:
> > Control: tags -1 patch
> > 
> > Hi,
> > 
> > On Wed, 24 Jan 2018 22:26:50 + 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.

It seems that your patch doesn't build. Check the logs at [0].

[0] https://buildd.debian.org/status/package.php?p=moc=unstable

I can prepare a tuned patch with upstream over the weekend and upload
next week via mentors.debian.net.

Elimar
-- 
  Never make anything simple and efficient when a way
  can be found to make it complex and wonderful ;-)


signature.asc
Description: PGP signature

Bug#888353: moc: FTBFS with FFmpeg 4.0

2018-07-17 Thread James Cowgill 
Control: tags -1 pending

Hi,

On Mon, 28 May 2018 20:24:23 +0100 James Cowgill 
wrote:
> Control: tags -1 patch
> 
> Hi,
> 
> On Wed, 24 Jan 2018 22:26:50 + 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/changelog2017-06-19 20:45:41.0 
+0100
+++ moc-2.6.0~svn-r2949/debian/changelog2018-07-17 11:20:03.0 
+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   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.0 +0100
+++ moc-2.6.0~svn-r2949/debian/patches/05_ffmpeg4.patch 2018-07-17 
11:19:42.0 +0100
@@ -0,0 +1,36 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill 
+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 (>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.0 
+0100
+++ moc-2.6.0~svn-r2949/debian/patches/series   2018-07-17 11:20:03.0 
+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