summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2013-11-02 17:32:09 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2013-11-02 17:32:09 +0000
commit1279069faaf341f71a5f0a06d423520dbef39e88 (patch)
treeab3864980dd5f501cf68e808d5074970e9e3a389 /media-plugins
parentRe-add keywords after testing (diff)
downloadgentoo-2-1279069faaf341f71a5f0a06d423520dbef39e88.tar.gz
gentoo-2-1279069faaf341f71a5f0a06d423520dbef39e88.tar.bz2
gentoo-2-1279069faaf341f71a5f0a06d423520dbef39e88.zip
compile fix for API change of 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-streamdev/ChangeLog6
-rw-r--r--media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff15
-rw-r--r--media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild4
3 files changed, 23 insertions, 2 deletions
diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index 390bc637cdb4..3a144202cda7 100644
--- a/media-plugins/vdr-streamdev/ChangeLog
+++ b/media-plugins/vdr-streamdev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-streamdev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.20 2013/03/31 16:22:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.21 2013/11/02 17:32:09 hd_brummy Exp $
+
+ 02 Nov 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+ vdr-streamdev-0.6.0.ebuild, +files/vdr-streamdev-0.6.0_vdr-2.1.2.diff:
+ compile fix for API change of VDR 2.1.2
*vdr-streamdev-0.6.0 (31 Mar 2013)
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff
new file mode 100644
index 000000000000..32389a4f9bcd
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff
@@ -0,0 +1,15 @@
+diff -Naur streamdev-0.6.0.orig/server/connectionVTP.c streamdev-0.6.0/server/connectionVTP.c
+--- streamdev-0.6.0.orig/server/connectionVTP.c 2013-11-02 18:22:55.000000000 +0100
++++ streamdev-0.6.0/server/connectionVTP.c 2013-11-02 18:24:57.000000000 +0100
+@@ -1377,7 +1377,11 @@
+ if (*Option) {
+ if (strcasecmp(Option, "DISK") == 0) {
+ int FreeMB, UsedMB;
++#if APIVERSNUM < 20102
+ int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++#else
++ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
++#endif
+ Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent);
+ }
+ else if (strcasecmp(Option, "NAME") == 0) {
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild
index 0999def10778..000b2dc11440 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild,v 1.1 2013/03/31 16:22:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild,v 1.2 2013/11/02 17:32:09 hd_brummy Exp $
EAPI="5"
@@ -25,6 +25,8 @@ REQUIRED_USE="|| ( client server )"
# vdr-plugin-2.eclass changes
PO_SUBDIR="client server"
+PATCHES=( "${FILESDIR}/${P}_vdr-2.1.2.diff" )
+
src_prepare() {
vdr-plugin-2_src_prepare