diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2009-01-06 20:22:30 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2009-01-06 20:22:30 +0000 |
| commit | e57d170cf3b32d54eb200c0d39d5ccc77ec742e7 (patch) | |
| tree | 8ab7ceea3d0497bc53479076a991d4379de5a68b /media-plugins | |
| parent | Marking fetchmail-6.3.9 ppc64 for bug 253871 (diff) | |
| download | gentoo-2-e57d170cf3b32d54eb200c0d39d5ccc77ec742e7.tar.gz gentoo-2-e57d170cf3b32d54eb200c0d39d5ccc77ec742e7.tar.bz2 gentoo-2-e57d170cf3b32d54eb200c0d39d5ccc77ec742e7.zip | |
fixed compile probs gcc-4.3.x #bug 251186, thanks to Diego E. Petteno; added compile fix for vdr-1.7.x
(Portage version: 2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686)
Diffstat (limited to 'media-plugins')
4 files changed, 43 insertions, 6 deletions
diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog index 9f680017a998..fd03798fa324 100644 --- a/media-plugins/vdr-channelscan/ChangeLog +++ b/media-plugins/vdr-channelscan/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-channelscan -# 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 $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.11 2009/01/06 20:22:30 hd_brummy Exp $ + + 06 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> + +files/vdr-channelscan-0.1.0-vdr-1.7.x.diff, + +files/vdr-channelscan-0.1.0_gcc-4.3.x.diff, vdr-channelscan-0.1.0.ebuild: + fixed compile probs gcc-4.3.x #bug 251186, thanks to Diego E. Petteno; + added compile fix for vdr-1.7.x 23 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> +files/vdr-channelscan-0.1.0-vdr-1.5.10.diff, diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff new file mode 100644 index 000000000000..b98784f00985 --- /dev/null +++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff @@ -0,0 +1,12 @@ +diff -Naur channelscan-0.1.0.orig/channelscan.c channelscan-0.1.0/channelscan.c +--- channelscan-0.1.0.orig/channelscan.c 2009-01-06 20:46:26.000000000 +0100 ++++ channelscan-0.1.0/channelscan.c 2009-01-06 20:48:32.000000000 +0100 +@@ -170,7 +170,7 @@ + Pol = &cTemp; + Symbolrate = oTransp.iSymbolrate[i]; + *SChannel=*OldChannel; +- SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO); ++ SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO,0,0,0); + cDevice::GetDevice(cardnr)->SwitchChannel(SChannel,HasSwitched); + PFilter = new PatFilter(); + SFilter = new SdtFilter(PFilter); diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff new file mode 100644 index 000000000000..bda2f179f9bb --- /dev/null +++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff @@ -0,0 +1,15 @@ +missing includes for gcc-4.3.x +https://bugs.gentoo.org/show_bug.cgi?id=251186 +diff -Naur channelscan-0.1.0.orig/transponders.h channelscan-0.1.0/transponders.h +--- channelscan-0.1.0.orig/transponders.h 2009-01-06 20:40:37.000000000 +0100 ++++ channelscan-0.1.0/transponders.h 2009-01-06 20:41:10.000000000 +0100 +@@ -7,7 +7,8 @@ + #include <iostream> + #include <fstream> + #include <dirent.h> +-#include <string> ++#include <string.h> ++#include <stdlib.h> + + using std::string; + using std::ifstream; 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 07b203544c69..3a5dc037ad73 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-2008 Gentoo Foundation +# Copyright 1999-2009 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.4 2008/04/23 09:00:03 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.5 2009/01/06 20:22:30 hd_brummy Exp $ inherit vdr-plugin @@ -20,16 +20,20 @@ RDEPEND="${DEPEND}" PATCHES=("${FILESDIR}/${P}-shared-data.diff" "${FILESDIR}/${P}-show-only-basename.diff" "${FILESDIR}/${P}-gcc4.diff" - "${FILESDIR}/${P}-vdr-1.5.10.diff") + "${FILESDIR}/${P}-vdr-1.5.10.diff" + "${FILESDIR}/${P}_gcc-4.3.x.diff") src_unpack() { vdr-plugin_src_unpack fix_vdr_libsi_include filter.c + + has_version ">=media-video/vdr-1.7.0" && \ + epatch "${FILESDIR}/${P}-vdr-1.7.x.diff" } src_install() { vdr-plugin_src_install insinto /usr/share/vdr/channelscan-transponders - doins ${S}/transponders/*.ini + doins "${S}"/transponders/*.ini } |