[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-reelchannelscan/files/0.4.3: series vdr-1.5.10.diff

[Matthias Schwarzott (zzam)]

zzam        07/11/21 10:33:14

  Modified:             series
  Added:                vdr-1.5.10.diff
  Log:
  Added patch to compile with vdr-1.5.10
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.3                  media-plugins/vdr-reelchannelscan/files/0.4.3/series

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/series?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/series?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/series?r1=1.2&r2=1.3

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/series,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- series	21 May 2007 11:51:20 -0000	1.2
+++ series	21 Nov 2007 10:33:14 -0000	1.3
@@ -2,3 +2,4 @@
 device-numbering.diff
 i18n.diff
 gentoo.diff
+vdr-1.5.10.diff



1.1                  media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff?rev=1.1&content-type=text/plain

Index: vdr-1.5.10.diff
===================================================================
Index: reelchannelscan-0.4.3/filter.h
===================================================================
--- reelchannelscan-0.4.3.orig/filter.h
+++ reelchannelscan-0.4.3/filter.h
@@ -90,7 +90,9 @@ public:
 #ifdef REELVDR 
 #define MAXNITS 256
 #endif
+#ifndef MAXNETWORKNAME
 #define MAXNETWORKNAME 256
+#endif
 
 
 class NitFilter : public cFilter {
Index: reelchannelscan-0.4.3/filter.c
===================================================================
--- reelchannelscan-0.4.3.orig/filter.c
+++ reelchannelscan-0.4.3/filter.c
@@ -400,16 +400,17 @@ void PatFilter::Process(u_short Pid, u_c
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS + 1] = { 0 };
         int Dpids[MAXDPIDS + 1] = { 0 };
-#if VDRVERSNUM >= 10332
+        int Spids[MAXSPIDS + 1] = { 0 };
+#ifndef MAXLANGCODE2
+#define MAXLANGCODE2 4
+#endif
         char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
         char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
-#else
-        char ALangs[MAXAPIDS + 1][4] = { "" };
-        char DLangs[MAXDPIDS + 1][4] = { "" };
-#endif
+        char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
+        int NumSpids = 0;
         for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
             //  printf("sid: %5d pid %5d str_t%2X \n", pmt.getServiceId(), stream.getPid(), stream.getStreamType());
 
@@ -454,6 +455,28 @@ void PatFilter::Process(u_short Pid, u_c
                             case SI::AC3DescriptorTag:
                                  dpid = stream.getPid();
                                  break;
+#if VDRVERSNUM >= 10510
+                            case SI::SubtitlingDescriptorTag:
+                                 if (NumSpids < MAXSPIDS) {
+                                    Spids[NumSpids] = stream.getPid();
+                                    SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
+                                    SI::SubtitlingDescriptor::Subtitling sub;
+                                    char *s = SLangs[NumSpids];
+                                    int n = 0;
+                                    for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
+                                        if (sub.languageCode[0]) {
+                                           if (n > 0)
+                                              *s++ = '+';
+                                           strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
+                                           s += strlen(s);
+                                           if (n++ > 1)
+                                              break;
+                                           }
+                                        }
+                                    NumSpids++;
+                                    }
+                                 break;
+#endif
                             case SI::TeletextDescriptorTag:
                                  Tpid = stream.getPid();
                                  break;
@@ -481,7 +504,11 @@ void PatFilter::Process(u_short Pid, u_c
                 delete d;
                 }
             }
+#if VDRVERSNUM >= 10510
+        Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+#else
         Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid);
+#endif
         //printf("#### %i %s %i %i SID  %i\n",num,Channel->Name(),Vpid, Apids[0], Channel->Sid());
         Channel->SetCaIds(CaDescriptors->CaIds());
         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));



-- 
gentoo-commits@g.o mailing list