diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2008-12-17 19:03:57 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-12-17 19:03:57 +0000 |
| commit | ca0a36b9fff85a2ce90820f79109b1c6057dbf5e (patch) | |
| tree | 72e1df9a8a7af49fd172e6c2338612ac6d973ca4 /media-plugins/vdr-ffnetdev | |
| parent | Several minor ebuild improvements, thanks to angelos. (diff) | |
| download | gentoo-2-ca0a36b9fff85a2ce90820f79109b1c6057dbf5e.tar.gz gentoo-2-ca0a36b9fff85a2ce90820f79109b1c6057dbf5e.tar.bz2 gentoo-2-ca0a36b9fff85a2ce90820f79109b1c6057dbf5e.zip | |
Last commit broke patching with vdr-1.4. Fix it.
(Portage version: 2.1.6.1/cvs/Linux 2.6.27-gentoo-r1 i686)
Diffstat (limited to 'media-plugins/vdr-ffnetdev')
4 files changed, 12 insertions, 7 deletions
diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog index 73c70cd50a64..42125a754dec 100644 --- a/media-plugins/vdr-ffnetdev/ChangeLog +++ b/media-plugins/vdr-ffnetdev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-ffnetdev # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.12 2008/12/17 14:54:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.13 2008/12/17 19:03:57 zzam Exp $ + + 17 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> + files/vdr-ffnetdev-0.1.0-gcc4.3.patch, + files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff, vdr-ffnetdev-0.1.0.ebuild: + Last commit broke patching with vdr-1.4. Fix it. 17 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> +files/vdr-ffnetdev-0.1.0-gcc4.3.patch, vdr-ffnetdev-0.1.0.ebuild: diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch index ac0ad6eb01cd..0c8825e4ee94 100644 --- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch +++ b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-gcc4.3.patch @@ -5,8 +5,8 @@ diff -ru vdr-ffnetdev-0.1.0-orig/netosd.h vdr-ffnetdev-0.1.0/netosd.h bool truecolor; protected: public: -- cNetOSD(int XOfs, int XOfs, uint level); -+ cNetOSD(int Left, int Top, uint level); +- cNetOSD(int XOfs, int XOfs); ++ cNetOSD(int Left, int Top); virtual ~cNetOSD(); virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas); virtual void Flush(void); diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff index f0d76645fe50..9c9bb957575a 100644 --- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff +++ b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-vdr-1.6.0.diff @@ -34,8 +34,8 @@ diff -ru --exclude=po vdr-ffnetdev-0.1.0-orig/netosd.h vdr-ffnetdev-0.1.0/netosd bool truecolor; protected: public: -- cNetOSD(int XOfs, int XOfs); -+ cNetOSD(int XOfs, int XOfs, uint level); +- cNetOSD(int Left, int Top); ++ cNetOSD(int Left, int Top, uint level); virtual ~cNetOSD(); virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas); virtual void Flush(void); diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild index c0a7d49f9a05..0e33390173e8 100644 --- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild +++ b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.11 2008/12/17 14:54:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.12 2008/12/17 19:03:57 zzam Exp $ inherit vdr-plugin eutils @@ -21,6 +21,7 @@ src_unpack() { vdr-plugin_src_unpack unpack epatch "${FILESDIR}/${P}-uint64.diff" + epatch "${FILESDIR}/${P}-gcc4.3.patch" if grep -q "virtual cString Active" /usr/include/vdr/plugin.h; then epatch "${FILESDIR}/${P}-bigpatch-headers.diff" @@ -30,7 +31,6 @@ src_unpack() { epatch "${FILESDIR}/${P}-vdr-1.6.0.diff" fi - epatch "${FILESDIR}/${P}-gcc4.3.patch" vdr-plugin_src_unpack all_but_unpack } |