[vdr] [PATCH] S2API for vdr-1.7.0 (quick hack for DVB-S/DVB-S2)

Gregoire Favre gregoire.favre at gmail.com
Thu Oct 2 15:30:07 CEST 2008


On Thu, Oct 02, 2008 at 03:16:29PM +0200, gimli wrote:
> Hi All,
> 
> another one for vdr 1.7.1 with the Extensions v64 patch from Zulu :
> vdr 1.7.1 + vdr-1.7.1_extensions.diff + vdr-1.7.1-ext_h264.diff.

Oh great new :-)

I just tried with --dry-run to patch my source's vdr :

patching file channels.c
Hunk #2 succeeded at 219 with fuzz 2 (offset -3 lines).
Hunk #3 succeeded at 337 with fuzz 2 (offset -10 lines).
Hunk #4 succeeded at 396 (offset -31 lines).
Hunk #5 succeeded at 409 (offset -31 lines).
Hunk #6 succeeded at 672 (offset -79 lines).
Hunk #7 succeeded at 680 (offset -79 lines).
Hunk #8 succeeded at 707 with fuzz 2 (offset -86 lines).
Hunk #9 succeeded at 718 (offset -86 lines).
patching file channels.h
Hunk #2 succeeded at 149 (offset -3 lines).
Hunk #3 succeeded at 209 with fuzz 1 (offset -9 lines).
Hunk #4 succeeded at 223 with fuzz 1 (offset -16 lines).
patching file dvbdevice.c
Hunk #1 succeeded at 76 (offset -3 lines).
Hunk #2 succeeded at 87 (offset -6 lines).
Hunk #3 succeeded at 94 with fuzz 1 (offset -9 lines).
Hunk #4 succeeded at 104 (offset -12 lines).
Hunk #5 succeeded at 127 (offset -12 lines).
Hunk #6 succeeded at 135 (offset -12 lines).
Hunk #7 succeeded at 192 (offset -25 lines).
Hunk #8 FAILED at 261.
Hunk #9 FAILED at 328.
Hunk #10 succeeded at 412 (offset -46 lines).
Hunk #11 succeeded at 475 with fuzz 1 (offset -46 lines).
Hunk #12 FAILED at 848.
3 out of 12 hunks FAILED -- saving rejects to file dvbdevice.c.rej
patching file dvbdevice.h
The next patch would create the file Make.config,
which already exists!  Assume -R? [n]
which already exists!  Assume -R? [n] n
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Make.config.rej
patching file menu.c
Hunk #1 FAILED at 276.
1 out of 1 hunk FAILED -- saving rejects to file menu.c.rej
patching file nit.c
Hunk #2 succeeded at 151 with fuzz 1.
Hunk #3 succeeded at 181 (offset 1 line).
Hunk #4 succeeded at 231 (offset 2 lines).
Hunk #5 FAILED at 256.
1 out of 5 hunks FAILED -- saving rejects to file nit.c.rej

The dvbdevice.c is not necessarly wrong, but Make.config shouldn't be
there (same for nit.c).

Could you explain what extensions diff is ?

Thanks.
-- 
Grégoire FAVRE  http://gregoire.favre.googlepages.com  http://www.gnupg.org
               http://picasaweb.google.com/Gregoire.Favre



More information about the vdr mailing list