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

Package-Manager: portage-2.1.4.4

3 files changed, 96 insertions, 5 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/Manifest b/media-plugins/vdr-rotor/Manifest
index f5a3a6f8fda0..2f60c396a4e2 100644
--- a/media-plugins/vdr-rotor/Manifest
+++ b/media-plugins/vdr-rotor/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-rotor-0.1.4_vdr-1.5.10.diff 4142 RMD160 f1fb29721fca68b1094d50ab59883df9902061c9 SHA1 79c827c0ccfe8254a2551528f6003ceb756c2e17 SHA256 5540695a98dc72b8e19f6a40bffed9e35660a5ce71aaf2f791489c07867f5255
 DIST vdr-rotor-0.1.4-vdr1.5.7.tgz 39572 RMD160 8e541ea64bb0d1cd7e72ca42795bd1665ef30e95 SHA1 df6ca6d6ee5dc832cb919b157e997e74aac3fcd7 SHA256 aad69f61af21e9438ed9d7e65efdb7c60b2f1f4291c0583767b6e8e30d6669a2
 DIST vdr-rotor-0.1.4.tgz 34968 RMD160 7811c14da307383254c9e32639cf3b258372aede SHA1 b82ff493e39b0c4be4ab204df007f0130b9a648f SHA256 eadb0c241c310fca4af3e23cb1476d19744156b011bce4cc94a69f25706247fa
 EBUILD vdr-rotor-0.1.4-r1.ebuild 973 RMD160 f1775ebd87b04ded6ea6d861e9c0196076c3664b SHA1 59d2b7d1b7727cff3e4a6f34c9f56c26662a716c SHA256 f915bae8941ccc921d899daa6544655bf34edfe10322393e2e0a3e65c70077f2
 EBUILD vdr-rotor-0.1.4.ebuild 823 RMD160 3a77f8050b88b2cae7b1964ddd018c86b00bcf9c SHA1 666044d3ac4c4baeb668b1442bf5ad4944a9de48 SHA256 761d0de5cb8a51f6a1fe9abe6a42e52ebbc734659ee31fc3856ebbd821e97999
-MISC ChangeLog 982 RMD160 e44f2c74accf119ab6f1cbc3e97dabe6919889f2 SHA1 86748d10f23989e0b92e4d0ff8fb5fe37c81f046 SHA256 b12dc61abfd3a97c1db7ba8fe7303166673dd478e95e8ebaf9eab6964a760894
+MISC ChangeLog 1151 RMD160 36b40b8f123aca9d954e1268546e3c6989147aa9 SHA1 54e595928d625cc967bb48d1bcf74ad8a937f5e6 SHA256 d1c373e02161c8985b8d0277be99634dbb27286d3ce4af4fc573346df951da88
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFH53yXdn07HTTCgIoRAkbzAKCK5MvZtfLCoknQEy2bEtk8uhKXMQCgh3J4
-UFg6IsTE854oLMffkNHnBJ0=
-=coIp
+iD8DBQFH964fdn07HTTCgIoRAp8CAKCbx2GSAcBUL/8TEsYYeD+TCFZcZwCgslXg
+QYkqTMDDl28FUFpfxFk4aCU=
+=AVcj
 -----END PGP SIGNATURE-----
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);