Hi
I have vdr 170 + h264 patch. I want to install the vdr-1.7.0-pluginparam.patch before iptv-0.2.1 plugin installation.
# cat vdr-1.7.0-pluginparam.patch | patch -p1 patching file channels.c Hunk #2 succeeded at 242 with fuzz 1. Hunk #3 succeeded at 269 (offset -2 lines). Hunk #4 succeeded at 278 (offset -2 lines). Hunk #5 succeeded at 340 (offset -2 lines). Hunk #6 succeeded at 491 (offset -2 lines). Hunk #7 succeeded at 726 (offset 28 lines). Hunk #8 succeeded at 742 (offset 28 lines). Hunk #9 succeeded at 764 (offset 28 lines). Hunk #10 succeeded at 879 (offset 28 lines). Hunk #11 succeeded at 970 (offset 28 lines). patching file channels.h Hunk #2 succeeded at 178 (offset 3 lines). Hunk #3 FAILED at 217. Hunk #4 succeeded at 226 (offset 4 lines). 1 out of 4 hunks FAILED -- saving rejects to file channels.h.rej patching file config.h patching file menu.c patching file po/fi_FI.po patching file po/fr_FR.po patching file sources.c patching file sources.conf patching file sources.h
channels.h.rej *** 215,220 **** int RollOff(void) const { return rollOff; } const cLinkChannels* LinkChannels(void) const { return linkChannels; } const cChannel *RefChannel(void) const { return refChannel; } bool IsCable(void) const { return cSource::IsCable(source); } bool IsSat(void) const { return cSource::IsSat(source); } bool IsTerr(void) const { return cSource::IsTerr(source); } --- 217,223 ---- int RollOff(void) const { return rollOff; } const cLinkChannels* LinkChannels(void) const { return linkChannels; } const cChannel *RefChannel(void) const { return refChannel; } + bool IsPlug(void) const { return cSource::IsPlug(source); } bool IsCable(void) const { return cSource::IsCable(source); } bool IsSat(void) const { return cSource::IsSat(source); } bool IsTerr(void) const { return cSource::IsTerr(source); }
On Sat, 19 Jul 2008, Goga777 wrote:
channels.h.rej --- 217,223 ---- int RollOff(void) const { return rollOff; } const cLinkChannels* LinkChannels(void) const { return linkChannels; } const cChannel *RefChannel(void) const { return refChannel; }
- bool IsPlug(void) const { return cSource::IsPlug(source); } bool IsCable(void) const { return cSource::IsCable(source); } bool IsSat(void) const { return cSource::IsSat(source); } bool IsTerr(void) const { return cSource::IsTerr(source); }
You'll have to add manually the "IsPlug" line into channels.h just before the "IsCable" line.
BR, -- rofa