[mythtv] DVB patch 2.1 failed with current CVS

[John Pullan]

Well, when did you get cvs out ?

The patch was generated over a week a go and I believe changes to
videosouce.cpp have been made in the mean time.

Either go back to the 13th Nov or wait for the next patch, or if you're
feeling really brave try this attachment.


On Mon, 2004-11-22 at 02:17 +0000, Chris Birkinshaw wrote:
> 
> When patching the current CVS (patch -p0 <
> mythtv_dvb_patch_v2.1/dvb_patch_v2.1.diff) I get the following error:
> 
> patching file libs/libmythtv/videosource.cpp
> Hunk #5 FAILED at 486.
> Hunk #6 succeeded at 527 (offset 4 lines).
> Hunk #8 succeeded at 730 (offset 4 lines).
> Hunk #10 succeeded at 918 (offset 4 lines).
> Hunk #12 succeeded at 1003 (offset 4 lines).
> Hunk #14 succeeded at 1066 (offset 4 lines).
> Hunk #16 succeeded at 1114 (offset 4 lines).
> Hunk #18 succeeded at 1195 (offset 4 lines).
> Hunk #20 succeeded at 1357 (offset 4 lines).
> Hunk #22 succeeded at 1414 (offset 4 lines).
> Hunk #24 succeeded at 1593 (offset 4 lines).
> Hunk #26 succeeded at 1716 (offset 4 lines).
> 1 out of 27 hunks FAILED -- saving rejects to file
> libs/libmythtv/videosource.cpp.rej
> 
> Any ideas?
> 
> Chris
> 
> 
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.
> _______________________________________________
> mythtv-dev mailing list
> mythtv-dev at mythtv.org
> http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
-- 
John Pullan <jmp at tarantella.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: videosource.cpp.diff.bz2
Type: application/x-bzip
Size: 9145 bytes
Desc: not available
Url : http://mythtv.org/pipermail/mythtv-dev/attachments/20041122/cd6a0164/videosource.cpp.diff-0001.bin