diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2013-10-22 23:11:52 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2013-10-22 23:11:52 +0000 |
| commit | 83dc72dbab83b517ddce09ad51a3849214e97827 (patch) | |
| tree | 88efb9bc16873dd48481790a09eb64eab30b1992 /media-plugins | |
| parent | vmhgfs does not compile with CONFIG_UIDGID_STRICT_TYPE_CHECKS, bug 474636. (diff) | |
| download | gentoo-2-83dc72dbab83b517ddce09ad51a3849214e97827.tar.gz gentoo-2-83dc72dbab83b517ddce09ad51a3849214e97827.tar.bz2 gentoo-2-83dc72dbab83b517ddce09ad51a3849214e97827.zip | |
compile fix vdr-2.1.2
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/vdr-epgsearch/ChangeLog | 8 | ||||
| -rw-r--r-- | media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff | 15 | ||||
| -rw-r--r-- | media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild | 6 |
3 files changed, 25 insertions, 4 deletions
diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog index d3d696a2db96..de50f9d8de8d 100644 --- a/media-plugins/vdr-epgsearch/ChangeLog +++ b/media-plugins/vdr-epgsearch/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-epgsearch -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.59 2012/12/15 13:27:34 hd_brummy Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.60 2013/10/22 23:11:52 hd_brummy Exp $ + + 22 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-epgsearch-1.0.0-r1.ebuild, +files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff: + compile fix vdr-2.1.2 15 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-epgsearch-1.0.0-r1.ebuild, +files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff: diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff new file mode 100644 index 000000000000..5b9d657e95ec --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff @@ -0,0 +1,15 @@ +diff -Naur epgsearch-1.0.0.orig/uservars.h epgsearch-1.0.0/uservars.h +--- epgsearch-1.0.0.orig/uservars.h 2013-10-23 00:54:29.000000000 +0200 ++++ epgsearch-1.0.0/uservars.h 2013-10-23 00:56:21.000000000 +0200 +@@ -537,7 +537,11 @@ + cVideodirVar() : cInternalVar("%videodir%") {} + string Evaluate(const cEvent*, bool escapeStrings = false) + { ++#if APIVERSNUM > 20101 ++ return cVideoDirectory::Name(); ++#else + return VideoDirectory; ++#endif + } + }; + diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild index e0604647ba71..b2a47c2d032e 100644 --- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild +++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild,v 1.5 2012/12/15 13:27:34 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild,v 1.6 2013/10/22 23:11:52 hd_brummy Exp $ EAPI="5" @@ -50,6 +50,8 @@ src_prepare() { epatch "${FILESDIR}/${P}_vdr-1.7.33.diff" fi + epatch "${FILESDIR}/${P}_vdr-2.1.2.diff" + # disable automagic deps sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/' |