compile fix for >=vdr-1.7.3

(Portage version: 2.1.6.11/cvs/Linux i686)

3 files changed, 87 insertions, 5 deletions

diff --git a/media-plugins/vdr-undelete/ChangeLog b/media-plugins/vdr-undelete/ChangeLog
index 6605cf604d50..3cc7d42da605 100644
--- a/media-plugins/vdr-undelete/ChangeLog
+++ b/media-plugins/vdr-undelete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-undelete
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-undelete/ChangeLog,v 1.10 2008/04/28 09:07:10 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-undelete/ChangeLog,v 1.11 2009/05/07 18:06:06 hd_brummy Exp $
+
+  07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-undelete-0.0.6-r1.ebuild, +files/vdr-undelete-0.0.6_vdr-1.7.3.diff:
+  compile fix for >=vdr-1.7.3
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-undelete-0.0.6-r1.ebuild:
diff --git a/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff b/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff
new file mode 100644
index 000000000000..fc5941d4fbdc
--- /dev/null
+++ b/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_undelete-0.0.6-1.7.3.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/undelete-0.0.6-1.7.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.7.3.
+
+@DPATCH@
+--- undelete-0.0.6/menuundelete.c
++++ undelete-0.0.6/menuundelete.c
+@@ -672,11 +672,20 @@ eOSState cMenuUndelete::ProcessKey(eKeys
+                                     processerror = true;
+                                   }
+                                   SalvageRecording = true;
++#if VDRVERSNUM >= 10703
++                                  cIndexFile *index = new cIndexFile(NewName, false, recording->IsPesRecording());
++#else
+                                   cIndexFile *index = new cIndexFile(NewName, false);
++#endif
+                                   int LastFrame = index->Last() - 1;
+                                   if (LastFrame > 0) {
++#if VDRVERSNUM >= 10703
++                                    uint16_t FileNumber = 0;
++                                    off_t FileOffset = 0;
++#else
+                                     uchar FileNumber = 0;
+                                     int FileOffset = 0;
++#endif
+                                     index->Get(LastFrame, &FileNumber, &FileOffset);
+                                     delete index;
+                                     if (FileNumber == 0) {
+@@ -686,7 +695,11 @@ eOSState cMenuUndelete::ProcessKey(eKeys
+                                     } else {
+                                       for (int i = 1; i <= FileNumber; i++) {
+                                         char *temp;
++#if VDRVERSNUM >= 10703
++                                        asprintf(&temp, recording->IsPesRecording() ? "%s/%03d.vdr" : "%s/%05d.ts", (const char *)NewName, i);
++#else
+                                         asprintf(&temp, "%s/%03d.vdr", (const char *)NewName, i);
++#endif
+                                         if (access(temp, R_OK) != 0) {
+                                           i = FileNumber;                                          
+                                           if (verbose.u)
+--- undelete-0.0.6/undelete.c
++++ undelete-0.0.6/undelete.c
+@@ -956,17 +956,30 @@ cString cPluginUndelete::SVDRPCommand(co
+             asprintf(&temp, "%sS#%d#", SVDRP_Process ? SVDRP_Process : "", recnumber);
+             free(SVDRP_Process);
+             SVDRP_Process = temp;
++#if VDRVERSNUM >= 10703
++            cIndexFile *index = new cIndexFile(NewName, false, recording->IsPesRecording());
++#else
+             cIndexFile *index = new cIndexFile(NewName, false);
++#endif
+             int LastFrame = index->Last() - 1;
+             if (LastFrame > 0) {
++#if VDRVERSNUM >= 10703
++              uint16_t FileNumber = 0;
++              off_t FileOffset = 0;
++#else
+               uchar FileNumber = 0;
+               int FileOffset = 0;
++#endif
+               index->Get(LastFrame, &FileNumber, &FileOffset);
+               delete index;
+               if (FileNumber == 0)
+                 return cString::sprintf("error while read last filenumber for \"%s\" [%s]", Option, recording->Title());
+               for (int i = 1; i <= FileNumber; i++) {
++#if VDRVERSNUM >= 10703
++                asprintf(&temp, recording->IsPesRecording() ? "%s/%03d.vdr" : "%s/%05d.ts", (const char *)NewName, i);
++#else
+                 asprintf(&temp, "%s/%03d.vdr", (const char *)NewName, i);
++#endif
+                 if (access(temp, R_OK) != 0) {
+                   free(temp);
+                   return cString::sprintf("error accessing vdrfile %03d for \"%s\" [%s]", i, Option, recording->Title());
diff --git a/media-plugins/vdr-undelete/vdr-undelete-0.0.6-r1.ebuild b/media-plugins/vdr-undelete/vdr-undelete-0.0.6-r1.ebuild
index 9087e2df9faa..20201bc3c6be 100644
--- a/media-plugins/vdr-undelete/vdr-undelete-0.0.6-r1.ebuild
+++ b/media-plugins/vdr-undelete/vdr-undelete-0.0.6-r1.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-undelete/vdr-undelete-0.0.6-r1.ebuild,v 1.6 2008/04/28 09:07:10 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-undelete/vdr-undelete-0.0.6-r1.ebuild,v 1.7 2009/05/07 18:06:06 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -15,6 +15,8 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~amd64"
 
 DEPEND=">=media-video/vdr-1.2.6"
+RDEPEND="${DEPEND}"
 
 PATCHES=("${FILESDIR}/${P#vdr-}-info.diff"
-	"${FILESDIR}/${P#vdr-}-vdr-1.5.7.diff")
+	"${FILESDIR}/${P#vdr-}-vdr-1.5.7.diff"
+	"${FILESDIR}/${P}_vdr-1.7.3.diff" )