diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2008-04-23 09:00:04 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-04-23 09:00:04 +0000 |
| commit | 0710b5c0e02cd212bc3725c8caef77c941415dd5 (patch) | |
| tree | b95c7053efc415179b746f74d9cf7fc5400d6184 /media-plugins/vdr-channelscan | |
| parent | Version bump. (diff) | |
| download | gentoo-2-0710b5c0e02cd212bc3725c8caef77c941415dd5.tar.gz gentoo-2-0710b5c0e02cd212bc3725c8caef77c941415dd5.tar.bz2 gentoo-2-0710b5c0e02cd212bc3725c8caef77c941415dd5.zip | |
Added vdr-1.5.10 patch from e-tobi.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'media-plugins/vdr-channelscan')
3 files changed, 50 insertions, 7 deletions
diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog index 084eb0d17681..9f680017a998 100644 --- a/media-plugins/vdr-channelscan/ChangeLog +++ b/media-plugins/vdr-channelscan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-channelscan -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.9 2006/08/15 10:24:26 zzam Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.10 2008/04/23 09:00:03 zzam Exp $ + + 23 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-channelscan-0.1.0-vdr-1.5.10.diff, + vdr-channelscan-0.1.0.ebuild: + Added vdr-1.5.10 patch from e-tobi. 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml: Assigned to Gentoo VDR Project. diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff new file mode 100644 index 000000000000..49113bc429ec --- /dev/null +++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.5.10.diff @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90_channelscan-0.1.0-1.5.10.dpatch by yolgecen at vdrportal.de +## http://vdrportal.de/board/thread.php?threadid=69815 +## +## Thomas Günther <tom@toms-cafe.de>: +## - Added compatibility to VDR < 1.5.10 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.10. + +@DPATCH@ +diff -ur channelscan-0.1.0/filter.c channelscan-0.1.0_vdr-1.5.10/filter.c +--- channelscan-0.1.0/filter.c 2005-09-20 19:21:25.000000000 +0200 ++++ channelscan-0.1.0_vdr-1.5.10/filter.c 2007-10-15 23:43:08.000000000 +0200 +@@ -372,6 +372,10 @@ + int Dpids[MAXDPIDS + 1] = { 0 }; + char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; + char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; ++#if VDRVERSNUM >= 10510 ++ int Spids[MAXDPIDS + 1] = { 0 }; ++ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; ++#endif + int Tpid = 0; + int NumApids = 0; + int NumDpids = 0; +@@ -445,7 +449,11 @@ + 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 + Channel->SetCaIds(CaDescriptors->CaIds()); + Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors)); + } diff --git a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild index 5315a912df6b..07b203544c69 100644 --- a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild +++ b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.4 2008/04/23 09:00:03 zzam Exp $ inherit vdr-plugin @@ -17,9 +17,10 @@ DEPEND=">=media-video/vdr-1.3.18" RDEPEND="${DEPEND}" # access transponder-data under /usr/share/vdr/channelscan-transponders -PATCHES="${FILESDIR}/${P}-shared-data.diff - ${FILESDIR}/${P}-show-only-basename.diff - ${FILESDIR}/${P}-gcc4.diff" +PATCHES=("${FILESDIR}/${P}-shared-data.diff" + "${FILESDIR}/${P}-show-only-basename.diff" + "${FILESDIR}/${P}-gcc4.diff" + "${FILESDIR}/${P}-vdr-1.5.10.diff") src_unpack() { vdr-plugin_src_unpack |