Re: [vdr] multiple patching trouble

[Udo Richter]

Am 21.06.2010 09:28, schrieb martinez:
> I've taken vanilla vdr 1.7.15 and applied the extensions patch V3 (see link 
> following)
> [...]
> and finally I try your patch (with --dry-run )
> 
> patch -p1 --dry-run < ../patches/event_1.7.15_patch 
> [...]
> 2 out of 9 hunks FAILED -- saving rejects to file menu.c.rej

Just by looking at both patches, these two updates seem to conflict:

Hunk 4:
@@ -1123,6 +1248,8 @@
   static void SetCurrentChannel(int ChannelNr) { currentChannel =
ChannelNr; }
   static const cEvent *ScheduleEvent(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual const cEvent* GetEvent(int Nr) const;
+  virtual int GetEventCount() const;
   };

 int cMenuWhatsOn::currentChannel = 0;


... and from extensions patch:

@@ -1369,13 +1662,21 @@
   static void SetCurrentChannel(int ChannelNr) { currentChannel =
ChannelNr; }
   static const cEvent *ScheduleEvent(void);
   virtual eOSState ProcessKey(eKeys Key);
+#ifdef USE_GRAPHTFT
+  virtual const char* MenuKind() { return now ? "MenuWhatsOnNow" :
"MenuWhatsOnNext"; }
+  virtual void Display(void);
+#endif /* GRAPHTFT */
   };

 int cMenuWhatsOn::currentChannel = 0;


So after applying both patches with the two failed hunks, add the two
new lines manually. The same applies to hunk 7:

@@ -1290,6 +1427,8 @@
   cMenuSchedule(void);
   virtual ~cMenuSchedule();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual const cEvent* GetEvent(int Nr) const;
+  virtual int GetEventCount() const;
   };

 cMenuSchedule::cMenuSchedule(void)

There's another part of GraphTFT conflicting here. Just do it the same way.


Cheers,

Udo

___
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr

Re: [vdr] multiple patching trouble

[Luca Olivetti]

Al 21/06/10 09:28, En/na martinez ha escrit:



Then I apply the freesat epg patch (necessary to see 7 days of epg on 28e 
rather than just now and next)
where I already don't know what I am doing 100% with eit.c.rej (see my previous 
post)

http://www.rst38.org.uk/vdr/freesat_20080927_vdr1.7.diff


Not a direct solution to your problem, but you can use the eepg plugin 
instead of patching vdr


http://www.linuxtv.org/vdrwiki/index.php/Eepg-plugin

Bye
--
Luca

___
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr

[vdr] multiple patching trouble

[martinez]

Hi Udo,

First of all thanks a lot for taking the time to write the patch for the event 
scrolling!!

I've taken vanilla vdr 1.7.15 and applied the extensions patch V3 (see link 
following)

http://copperhead.vdr-developer.org/downloads/extensionpatch/ExtP-NG-vdr-1.7.15-V3.diff

Then I apply the freesat epg patch (necessary to see 7 days of epg on 28e 
rather than just now and next)
where I already don't know what I am doing 100% with eit.c.rej (see my previous 
post)

http://www.rst38.org.uk/vdr/freesat_20080927_vdr1.7.diff

and finally I try your patch (with --dry-run )

patch -p1 --dry-run < ../patches/event_1.7.15_patch 
patching file menu.h
Hunk #1 succeeded at 95 with fuzz 2 (offset 50 lines).
patching file menu.c
Hunk #1 succeeded at 1438 with fuzz 1 (offset 464 lines).
Hunk #2 succeeded at 1544 (offset 467 lines).
Hunk #3 succeeded at 1770 (offset 539 lines).
Hunk #4 FAILED at 1787.
Hunk #5 succeeded at 1945 (offset 565 lines).
Hunk #6 succeeded at 1959 (offset 565 lines).
Hunk #7 FAILED at 1992.
Hunk #8 succeeded at 2241 (offset 584 lines).
Hunk #9 succeeded at 2269 with fuzz 1 (offset 584 lines).
2 out of 9 hunks FAILED -- saving rejects to file menu.c.rej

Can you (or some other clever person) help ?



___
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr