Control: tags 888370 + pending Dear maintainer,
I've prepared an NMU for avifile (versioned as 1:0.7.48~20090503.ds-20.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru avifile-0.7.48~20090503.ds/debian/changelog avifile-0.7.48~20090503.ds/debian/changelog --- avifile-0.7.48~20090503.ds/debian/changelog 2017-07-25 19:18:07.000000000 +0200 +++ avifile-0.7.48~20090503.ds/debian/changelog 2018-07-11 21:30:18.000000000 +0200 @@ -1,3 +1,11 @@ +avifile (1:0.7.48~20090503.ds-20.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Fix build against ffmpeg 4.0. Thanks to James Cowgill for + the patch. (Closes: #888370) + + -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Jul 2018 21:30:18 +0200 + avifile (1:0.7.48~20090503.ds-20) unstable; urgency=low * Bump Standards-Version to 4.0.0: nothing needs to be changed diff -Nru avifile-0.7.48~20090503.ds/debian/patches/ffmpeg4.0.patch avifile-0.7.48~20090503.ds/debian/patches/ffmpeg4.0.patch --- avifile-0.7.48~20090503.ds/debian/patches/ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ avifile-0.7.48~20090503.ds/debian/patches/ffmpeg4.0.patch 2018-07-11 21:29:48.000000000 +0200 @@ -0,0 +1,54 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: James Cowgill <jcowg...@debian.org> +Bug-Debian: https://bugs.debian.org/888370 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/aviread/FFReadStream.cpp ++++ b/lib/aviread/FFReadStream.cpp +@@ -69,7 +69,7 @@ FFReadStream::FFReadStream(FFReadHandler + AVCodec* codec = avcodec_find_decoder(avs->codec->codec_id); + if (codec && avcodec_open2(m_pAvContext, codec, NULL) == 0) + { +- m_pAvContext->flags |= CODEC_FLAG_TRUNCATED; ++ m_pAvContext->flags |= AV_CODEC_FLAG_TRUNCATED; + m_pAvContext->skip_frame = AVDISCARD_NONKEY; + //printf("Opened hurryup decoder %p %p\n", codec, m_pAvContext->codec->decode); + } +--- a/plugins/libffmpeg/FFVideoDecoder.cpp ++++ b/plugins/libffmpeg/FFVideoDecoder.cpp +@@ -38,7 +38,7 @@ FFVideoDecoder::FFVideoDecoder(AVCodec* + if (0 && m_pFormat->biCompression == fccHFYU) + { + // for now disabled +- m_pAvCodec->capabilities &= ~(CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1); ++ m_pAvCodec->capabilities &= ~(AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1); + AVM_WRITE(m_Info.GetPrivateName(), "if you have troubles - use Win32 codec instead\n"); + m_Caps = (CAPS) (m_Caps | CAP_YUY2); + } +@@ -191,7 +191,7 @@ int FFVideoDecoder::DecodeFrame(CImage* + const char* drtxt = "doesn't support"; + + m_bDirect = false; +- if (m_pAvCodec->capabilities & CODEC_CAP_DR1) ++ if (m_pAvCodec->capabilities & AV_CODEC_CAP_DR1) + { + drtxt = "not using"; + if (pImage) +@@ -296,7 +296,7 @@ int FFVideoDecoder::DecodeFrame(CImage* + // try using draw_horiz_band if DR1 is unsupported + m_pAvContext->draw_horiz_band = + (!m_bDirect && pImage && pImage->Format() == IMG_FMT_YV12 +- && (m_pAvCodec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND) ++ && (m_pAvCodec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND) + && !pImage->Direction() && render) ? draw_slice : 0; + m_pAvContext->opaque = this; + +@@ -330,7 +330,7 @@ int FFVideoDecoder::DecodeFrame(CImage* + av_frame_unref(pic); + return hr; + } +- if (!(m_pAvContext->flags & CODEC_FLAG_TRUNCATED)) ++ if (!(m_pAvContext->flags & AV_CODEC_FLAG_TRUNCATED)) + { + hr = (int)size; + //m_bUsed = true; diff -Nru avifile-0.7.48~20090503.ds/debian/patches/series avifile-0.7.48~20090503.ds/debian/patches/series --- avifile-0.7.48~20090503.ds/debian/patches/series 2017-07-25 19:12:23.000000000 +0200 +++ avifile-0.7.48~20090503.ds/debian/patches/series 2018-07-11 21:29:50.000000000 +0200 @@ -14,3 +14,4 @@ ffmpeg_2.9.patch port-to-gcc6.patch reproducible-build.patch +ffmpeg4.0.patch
signature.asc
Description: PGP signature
