diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2007-11-21 10:33:15 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-11-21 10:33:15 +0000 |
commit | 4c454f4b3190e31ee4cb861affd91308d3bce9da (patch) | |
tree | 5cd9807dedb274dfd957a68dbeccff29e7ac5b6d /media-plugins/vdr-reelchannelscan/files | |
parent | Marked stable on x86. (diff) | |
download | gentoo-2-4c454f4b3190e31ee4cb861affd91308d3bce9da.tar.gz gentoo-2-4c454f4b3190e31ee4cb861affd91308d3bce9da.tar.bz2 gentoo-2-4c454f4b3190e31ee4cb861affd91308d3bce9da.zip |
Added patch to compile with vdr-1.5.10
(Portage version: 2.1.3.19)
Diffstat (limited to 'media-plugins/vdr-reelchannelscan/files')
3 files changed, 86 insertions, 0 deletions
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/series b/media-plugins/vdr-reelchannelscan/files/0.4.3/series index 9039c46d25cf..e07d585dc4f6 100644 --- a/media-plugins/vdr-reelchannelscan/files/0.4.3/series +++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/series @@ -2,3 +2,4 @@ default-source-if-no-channel-set.diff device-numbering.diff i18n.diff gentoo.diff +vdr-1.5.10.diff diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff new file mode 100644 index 000000000000..ab9468f110c3 --- /dev/null +++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/vdr-1.5.10.diff @@ -0,0 +1,82 @@ +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)); diff --git a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r3 b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r3 new file mode 100644 index 000000000000..eef97dc65401 --- /dev/null +++ b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r3 @@ -0,0 +1,3 @@ +MD5 94c927c3b88cfcda80ba70a002dd28f1 vdr-reelchannelscan-0.4.3.tgz 84785 +RMD160 a498de279c406527a44295d9e6331de69606c390 vdr-reelchannelscan-0.4.3.tgz 84785 +SHA256 d8ac8dd1f3792ef3d5ddf8a62de528dea3d8980becf658c6cc0887a5f67fe2f9 vdr-reelchannelscan-0.4.3.tgz 84785 |