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 | bba5a06308e21dee92d49e15a67823cceb41141c (patch) | |
tree | c57128152944cc6a68544c1a7e52b20d4ca48e69 /media-plugins/vdr-reelchannelscan | |
parent | Marked stable on x86. (diff) | |
download | historical-bba5a06308e21dee92d49e15a67823cceb41141c.tar.gz historical-bba5a06308e21dee92d49e15a67823cceb41141c.tar.bz2 historical-bba5a06308e21dee92d49e15a67823cceb41141c.zip |
Added patch to compile with vdr-1.5.10
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'media-plugins/vdr-reelchannelscan')
6 files changed, 163 insertions, 12 deletions
diff --git a/media-plugins/vdr-reelchannelscan/ChangeLog b/media-plugins/vdr-reelchannelscan/ChangeLog index c6e6e38a8521..824f9c8b686c 100644 --- a/media-plugins/vdr-reelchannelscan/ChangeLog +++ b/media-plugins/vdr-reelchannelscan/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-reelchannelscan # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.15 2007/11/21 09:45:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.16 2007/11/21 10:33:13 zzam Exp $ + +*vdr-reelchannelscan-0.4.3-r3 (21 Nov 2007) + + 21 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/0.4.3/vdr-1.5.10.diff, files/0.4.3/series, + +vdr-reelchannelscan-0.4.3-r3.ebuild: + Added patch to compile with vdr-1.5.10 21 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-reelchannelscan-0.3.3.ebuild, vdr-reelchannelscan-0.4.3-r2.ebuild: diff --git a/media-plugins/vdr-reelchannelscan/Manifest b/media-plugins/vdr-reelchannelscan/Manifest index 788ed36d858a..60ffe34ef53b 100644 --- a/media-plugins/vdr-reelchannelscan/Manifest +++ b/media-plugins/vdr-reelchannelscan/Manifest @@ -17,10 +17,14 @@ AUX 0.4.3/i18n.diff 1700 RMD160 54d18c64d7b5b971a6d55552ddfe5b65819bb6c7 SHA1 55 MD5 af8ae41d58d9a531177b588ee55addab files/0.4.3/i18n.diff 1700 RMD160 54d18c64d7b5b971a6d55552ddfe5b65819bb6c7 files/0.4.3/i18n.diff 1700 SHA256 15cdc77f53efd550494305d8ea5796299ac86c462dbb4879e4f1117d1bb49249 files/0.4.3/i18n.diff 1700 -AUX 0.4.3/series 82 RMD160 6536c2d6720c45b94581072da8824e3450a5448f SHA1 3fe661d3874617a7bd76d1cf280205ba985d3f56 SHA256 f503451f6c2fefdf2e3954d276be4e27fcfb622fb353c31f9e5b851e8bbd3117 -MD5 26fcbee5e6fbc3e284ba87ae167b4cb4 files/0.4.3/series 82 -RMD160 6536c2d6720c45b94581072da8824e3450a5448f files/0.4.3/series 82 -SHA256 f503451f6c2fefdf2e3954d276be4e27fcfb622fb353c31f9e5b851e8bbd3117 files/0.4.3/series 82 +AUX 0.4.3/series 98 RMD160 ac3d69ee779f0ed84f1febb95779abc070c9273c SHA1 8efc825b291dd4b6abd1d62524f73903176374bd SHA256 73e1fb803f10f2e54297b4f20d4dea0a558919f2dec095e073d98970a255c6ef +MD5 9ccb7bd2745adedc8bf0d8532d41f1d5 files/0.4.3/series 98 +RMD160 ac3d69ee779f0ed84f1febb95779abc070c9273c files/0.4.3/series 98 +SHA256 73e1fb803f10f2e54297b4f20d4dea0a558919f2dec095e073d98970a255c6ef files/0.4.3/series 98 +AUX 0.4.3/vdr-1.5.10.diff 3705 RMD160 d6911b0e72133dbca228c6b08a550580766ebf33 SHA1 0578e6f53a378ec6b6cde3d6ff9223bd79d3cd1e SHA256 9c7d4710ffad4735c5d60841ae005aa652571b46de97001f4c65d06b01782a68 +MD5 9b47960b92399906ffff46d8f3c1aa59 files/0.4.3/vdr-1.5.10.diff 3705 +RMD160 d6911b0e72133dbca228c6b08a550580766ebf33 files/0.4.3/vdr-1.5.10.diff 3705 +SHA256 9c7d4710ffad4735c5d60841ae005aa652571b46de97001f4c65d06b01782a68 files/0.4.3/vdr-1.5.10.diff 3705 DIST vdr-reelchannelscan-0.3.3.tgz 69313 RMD160 bcdb3327d610f27045e4cb0fc8d8bb82c1030fec SHA1 db24e7e35c70129b6e1aedf3e87f36bc8a9f624f SHA256 8ed4e17d456b881da1646f1963c189723f84351753460c96e8c3b56b3deab305 DIST vdr-reelchannelscan-0.4.3.tgz 84785 RMD160 a498de279c406527a44295d9e6331de69606c390 SHA1 adf6db4991577e67421c181f71dad1a7d57d2f3b SHA256 d8ac8dd1f3792ef3d5ddf8a62de528dea3d8980becf658c6cc0887a5f67fe2f9 EBUILD vdr-reelchannelscan-0.3.3.ebuild 1031 RMD160 4fe0135f0c39883fa8b146179e4c81d299c373f9 SHA1 933b8aa36fe677deccba7c09458196c8ab73bd8d SHA256 ab5c8c436475e6335992fed2a1750db14913386e904d9067f2c93c443d1803eb @@ -31,10 +35,14 @@ EBUILD vdr-reelchannelscan-0.4.3-r2.ebuild 1207 RMD160 6708b5ac406e74d2602315cbc MD5 7e1bcf3253315752f63e36c12c037c8a vdr-reelchannelscan-0.4.3-r2.ebuild 1207 RMD160 6708b5ac406e74d2602315cbc1ec6e369a31bbb0 vdr-reelchannelscan-0.4.3-r2.ebuild 1207 SHA256 d8ab7dd1ecf0bf9cb7150f359130c289f9f1700ee11e4df62a99994eae059335 vdr-reelchannelscan-0.4.3-r2.ebuild 1207 -MISC ChangeLog 3172 RMD160 e060e9d5bff35321a33c94e1b37346c2d778e99f SHA1 92368cd0f891c5ebef7b5997da3dce3a840bde7e SHA256 d998859c1e2c067e4a3be2bcb939df4a94438ed4322865125d511b4d529f4d79 -MD5 534d38f9254fcbe6946c96b1078d4bf9 ChangeLog 3172 -RMD160 e060e9d5bff35321a33c94e1b37346c2d778e99f ChangeLog 3172 -SHA256 d998859c1e2c067e4a3be2bcb939df4a94438ed4322865125d511b4d529f4d79 ChangeLog 3172 +EBUILD vdr-reelchannelscan-0.4.3-r3.ebuild 1252 RMD160 584bc63c9b1ec0b97cf5a9a8a2cbc38baa701cf5 SHA1 5214e1af2c58db91ada6a8a890309fc13e2667ac SHA256 f7f44f554dab51656bb3c1645d3227c07af434031e558f11ca14a471d49de82b +MD5 1a429fad4b05af73030ad1450e3d3b63 vdr-reelchannelscan-0.4.3-r3.ebuild 1252 +RMD160 584bc63c9b1ec0b97cf5a9a8a2cbc38baa701cf5 vdr-reelchannelscan-0.4.3-r3.ebuild 1252 +SHA256 f7f44f554dab51656bb3c1645d3227c07af434031e558f11ca14a471d49de82b vdr-reelchannelscan-0.4.3-r3.ebuild 1252 +MISC ChangeLog 3404 RMD160 9deac129a426492e0b4639b842d2a1cfafb3a010 SHA1 afabcb6b91a7ac8b4923e60b61d41b3b9d22e1c5 SHA256 6aab44341b6e59d1a7b352aa9475b5886f9d45c9fae16e4ed93972b6a1e371db +MD5 f4b45deb31cc083367095fcefd8fba22 ChangeLog 3404 +RMD160 9deac129a426492e0b4639b842d2a1cfafb3a010 ChangeLog 3404 +SHA256 6aab44341b6e59d1a7b352aa9475b5886f9d45c9fae16e4ed93972b6a1e371db ChangeLog 3404 MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231 MD5 99b79afc01e96944c8afdb90ccc03cab metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a metadata.xml 309 @@ -45,10 +53,13 @@ SHA256 c15af2466be6d88c81899a9b6a79e47b159ad9a5d08184b82ab8786c65aea0d6 files/di MD5 dc954ffb6f64a5c084bbb5d36e641eff files/digest-vdr-reelchannelscan-0.4.3-r2 265 RMD160 1a2f933e9db1935877f4f3808b7d828c8c90ae07 files/digest-vdr-reelchannelscan-0.4.3-r2 265 SHA256 3a183d9e43786ddff7bf1f4ec801b5601020d1058a22023aa846edd82dc0b5bf files/digest-vdr-reelchannelscan-0.4.3-r2 265 +MD5 dc954ffb6f64a5c084bbb5d36e641eff files/digest-vdr-reelchannelscan-0.4.3-r3 265 +RMD160 1a2f933e9db1935877f4f3808b7d828c8c90ae07 files/digest-vdr-reelchannelscan-0.4.3-r3 265 +SHA256 3a183d9e43786ddff7bf1f4ec801b5601020d1058a22023aa846edd82dc0b5bf files/digest-vdr-reelchannelscan-0.4.3-r3 265 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHQ/45t2vP6XvVdOcRAvDBAJsEQXU6lZ67m29deoG+TWnJl45KrwCfeg0f -SaUffy7fY+HzSHwc6SJLQNg= -=+swo +iD8DBQFHRAlwt2vP6XvVdOcRAqd8AJ4xFgHHYRhpLCvbBRD7J1Itr2o91gCgtkq6 +Jp83iVZg/JEN1g9lSXqKpoM= +=M5N/ -----END PGP SIGNATURE----- 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 diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild new file mode 100644 index 000000000000..4e03316d8909 --- /dev/null +++ b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r3.ebuild,v 1.1 2007/11/21 10:33:13 zzam Exp $ + +inherit vdr-plugin eutils + +DESCRIPTION="vdr Plugin: Channel Scanner" +HOMEPAGE="http://www.reel-multimedia.com" +SRC_URI="mirror://gentoo/${P}.tgz + http://dev.gentoo.org/~zzam/distfiles/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.3.18" + +pkg_setup(){ + vdr-plugin_pkg_setup + + if ! grep -q scanning_on_receiving_device /usr/include/vdr/device.h; then + ewarn "your vdr needs to be patched to use vdr-channelscan" + die "unpatched vdr detected" + fi +} + +src_unpack() { + vdr-plugin_src_unpack unpack + cd "${S}" + epatch "${FILESDIR}/${PV}/default-source-if-no-channel-set.diff" + epatch "${FILESDIR}/${PV}/device-numbering.diff" + epatch "${FILESDIR}/${PV}/i18n.diff" + epatch "${FILESDIR}/${PV}/gentoo.diff" + epatch "${FILESDIR}/${PV}/vdr-1.5.10.diff" + + fix_vdr_libsi_include filter.[ch] + vdr-plugin_src_unpack all_but_unpack +} + +src_install() { + vdr-plugin_src_install + + cd "${S}"/transponders + insinto /usr/share/vdr/reelchannelscan/transponders + doins *.tpl +} |