summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2013-10-26 20:39:42 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2013-10-26 20:39:42 +0000
commit817db700cc609d3fa1adfb50e8adb90a8827bb0d (patch)
tree974809d84ef793aaf3304ed3eee3c44496433468 /media-plugins/vdr-text2skin
parentStable for amd64, wrt bug #489410 (diff)
downloadgentoo-2-817db700cc609d3fa1adfb50e8adb90a8827bb0d.tar.gz
gentoo-2-817db700cc609d3fa1adfb50e8adb90a8827bb0d.tar.bz2
gentoo-2-817db700cc609d3fa1adfb50e8adb90a8827bb0d.zip
compilefix vdr-2.1.2; eapi=5
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'media-plugins/vdr-text2skin')
-rw-r--r--media-plugins/vdr-text2skin/ChangeLog8
-rw-r--r--media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff15
-rw-r--r--media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild8
3 files changed, 26 insertions, 5 deletions
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index b8363eda2905..af652680a1e6 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-text2skin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.17 2012/06/10 14:28:19 hd_brummy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.18 2013/10/26 20:39:42 hd_brummy Exp $
+
+ 26 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+ vdr-text2skin-1.3.2.ebuild, +files/vdr-text2skin-1.3.2_vdr-2.1.2.diff:
+ compilefix vdr-2.1.2; eapi=5
10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
vdr-text2skin-1.3.2.ebuild:
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
new file mode 100644
index 000000000000..7a4873db751d
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
@@ -0,0 +1,15 @@
+diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
+--- text2skin-1.3.2.orig/render.c 2013-10-26 22:29:16.000000000 +0200
++++ text2skin-1.3.2/render.c 2013-10-26 22:33:19.000000000 +0200
+@@ -813,7 +813,11 @@
+ switch (Token.Type) {
+ case tFreeDiskSpace: {
+ int FreeMB;
++#if APIVERSNUM > 20101
++ cVideoDirectory::VideoDiskSpace(&FreeMB);
++#else
+ VideoDiskSpace(&FreeMB);
++#endif
+ Dprintf("FreeMB: %d, attrib type is %d\n", FreeMB,Token.Attrib.Type);
+ return Token.Attrib.Type == aString && Token.Attrib.Text.length() > 0
+ ? (cxType)DurationType(FreeMB * 60 / MB_PER_MINUTE,
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
index 91887de9ecf3..ac4bef051e42 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# 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-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.7 2012/06/10 14:28:19 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.8 2013/10/26 20:39:42 hd_brummy Exp $
-EAPI="4"
+EAPI="5"
inherit vdr-plugin-2
@@ -60,6 +60,8 @@ src_prepare() {
if has_version ">=media-video/vdr-1.7.27"; then
epatch "${FILESDIR}/vdr-1.7.27.diff"
fi
+
+ epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
}
src_install() {