added missing diff, bug 216336; thanks to D.Liana for reporting this

(Portage version: 2.1.4.4)

2 files changed, 91 insertions, 1 deletions

diff --git a/media-plugins/vdr-rotor/ChangeLog b/media-plugins/vdr-rotor/ChangeLog
index 8d61f18262fa..b5161b8f539f 100644
--- a/media-plugins/vdr-rotor/ChangeLog
+++ b/media-plugins/vdr-rotor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-rotor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.6 2008/03/24 10:03:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.7 2008/04/05 16:51:34 hd_brummy Exp $
+
+  05 Apr 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-rotor-0.1.4_vdr-1.5.10.diff:
+  added missing diff, bug 216336; thanks to D.Liana for reporting this
 
 *vdr-rotor-0.1.4-r1 (24 Mar 2008)
 
diff --git a/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff b/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff
new file mode 100644
index 000000000000..dbb996af7acf
--- /dev/null
+++ b/media-plugins/vdr-rotor/files/vdr-rotor-0.1.4_vdr-1.5.10.diff
@@ -0,0 +1,86 @@
+diff -ur rotor-0.1.4/filter.c rotor-0.1.4_vdr-1.5.10/filter.c
+--- rotor-0.1.4/filter.c        2007-10-14 11:37:13.000000000 +0200
++++ rotor-0.1.4_vdr-1.5.10/filter.c     2007-10-15 22:56:43.000000000 +0200
+@@ -368,12 +368,15 @@
+         int Ppid = pmt.getPCRPid();
+         int Apids[MAXAPIDS + 1] = { 0 };
+         int Dpids[MAXDPIDS + 1] = { 0 };
++        int Spids[MAXDPIDS + 1] = { 0 };
+ #if VDRVERSNUM >= 10332
+         char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
+         char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
++        char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
+ #else
+         char ALangs[MAXAPIDS + 1][4] = { "" };
+         char DLangs[MAXDPIDS + 1][4] = { "" };
++        char SLangs[MAXDPIDS + 1][4] = { "" };
+ #endif
+         int Tpid = 0;
+         int NumApids = 0;
+@@ -448,7 +451,7 @@
+                 delete d;
+                 }
+             }
+-        Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid);
++        Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+         Menu->SetCaIds(pmt.getServiceId(),CaDescriptors->CaIds());
+         Menu->SetCaDescriptors(pmt.getServiceId(),CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+         }
+diff -ur rotor-0.1.4/menu.c rotor-0.1.4_vdr-1.5.10/menu.c
+--- rotor-0.1.4/menu.c  2007-10-14 11:37:12.000000000 +0200
++++ rotor-0.1.4_vdr-1.5.10/menu.c       2007-10-15 22:55:27.000000000 +0200
+@@ -406,12 +406,15 @@
+     channel->SetId(Channel[Num].Nid(),Channel[Num].Tid(),Channel[Num].Sid(),channel->Rid());
+     int Apids[MAXAPIDS + 1] = { 0 };
+     int Dpids[MAXDPIDS + 1] = { 0 };
++    int Spids[MAXDPIDS + 1] = { 0 };
+ #if VDRVERSNUM>=10332
+     char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
+     char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
++    char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
+ #else
+     char ALangs[MAXAPIDS + 1][4] = { "" };
+     char DLangs[MAXDPIDS + 1][4] = { "" };
++    char SLangs[MAXDPIDS + 1][4] = { "" };
+ #endif
+     int CaIds[MAXCAIDS+1] = { 0 };
+     for (int i=0; i<=MAXAPIDS; i++)
+@@ -426,7 +429,7 @@
+     }
+     for (int i=0; i<=MAXCAIDS; i++)
+       CaIds[i]=Channel[Num].Ca(i);
+-    channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Channel[Num].Tpid());
++    channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Spids,SLangs,Channel[Num].Tpid());
+     channel->SetCaIds(CaIds);
+   }
+   else
+@@ -456,7 +459,7 @@
+ }
+
+ #if VDRVERSNUM>=10332
+-void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid)
++void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
+ #else
+ void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid)
+ #endif
+@@ -464,7 +467,7 @@
+   for (int i=0; i<num; i++)
+     if (Sid==Channel[i].Sid())
+     {
+-      Channel[i].SetPids(Vpid,Ppid,Apids,ALangs,Dpids,DLangs,Tpid);
++      Channel[i].SetPids(Vpid,Ppid,Apids,ALangs,Dpids,DLangs,Spids,SLangs,Tpid);
+       display(i);
+     }
+ }
+diff -ur rotor-0.1.4/menu.h rotor-0.1.4_vdr-1.5.10/menu.h
+--- rotor-0.1.4/menu.h  2007-10-14 11:37:12.000000000 +0200
++++ rotor-0.1.4_vdr-1.5.10/menu.h       2007-10-15 22:54:21.000000000 +0200
+@@ -116,7 +116,7 @@
+   virtual eOSState ProcessKey(eKeys Key);
+   void AddChannel(int Num);
+   void NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid);
+-  void SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
++  void SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+   void SetCaIds(int Sid,const int *CaIds);
+   void SetCaDescriptors(int Sid,int Level);
+   cChannel* GetChannel(int Sid);