Added patch to compile with vdr-1.5.10

(Portage version: 2.1.3.19)

5 files changed, 141 insertions, 1 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/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
+}