Control: tags -1 - patch

On 2015-11-02 22:07:27, Andreas Cadhalpun wrote:
> Package: lives
> Version: 2.4.0~ds0-1
> Severity: important
> Tags: patch
> User: pkg-multimedia-maintain...@lists.alioth.debian.org
> Usertags: ffmpeg2.9
> 
> Dear Maintainer,
> 
> your package fails to build with the upcoming ffmpeg 2.9.
> This bug will become release-critical at some point when the
> ffmpeg2.9 transition gets closer.
> 
> Attached is a patch replacing the deprecated functionality.
> It also works with ffmpeg 2.8.
> Please apply this patch and forward it upstream, if necessary.

Thanks for the patch, but it no longer applies cleanly:

dpkg-buildpackage: source package lives
dpkg-buildpackage: source version 2.6.0-1
dpkg-buildpackage: source distribution UNRELEASED
dpkg-buildpackage: source changed by Sebastian Ramacher <sramac...@debian.org>
 dpkg-source --before-build lives
dpkg-source: info: using options from lives/debian/source/local-options: 
--unapply-patches --abort-on-upstream-changes
dpkg-source: info: applying 02-drop_py3_multiencoder.patch
dpkg-source: info: applying parallel-build.patch
dpkg-source: info: applying 04-underlinking.patch
dpkg-source: info: applying ffmpeg_2.9.patch
patching file libweed/weed-compat.h
Hunk #1 FAILED at 590.
Hunk #2 succeeded at 644 (offset 5 lines).
1 out of 2 hunks FAILED
patching file lives-plugins/plugins/decoders/avformat_decoder.c
Hunk #1 FAILED at 70.
1 out of 1 hunk FAILED
patching file lives-plugins/plugins/decoders/mkv_decoder.c
patching file lives-plugins/plugins/decoders/mpegts_decoder.c
patching file src/colourspace.c
Hunk #2 succeeded at 10211 (offset 32 lines).
Hunk #3 succeeded at 10249 (offset 32 lines).
Hunk #4 succeeded at 10396 (offset 32 lines).
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'ffmpeg_2.9.patch' is correctly applied by quilt, 
use 'quilt refresh' to update it
dpkg-source: info: restoring quilt backup files for ffmpeg_2.9.patch
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B 
.pc/ffmpeg_2.9.patch/ --reject-file=- < lives/debian/patches/ffmpeg_2.9.patch 
gave error exit status 1
dpkg-buildpackage: error: dpkg-source --before-build lives gave error exit 
status 2

Cheers
-- 
Sebastian Ramacher

Attachment: signature.asc
Description: PGP signature

Reply via email to