compile fix for >=vdr-1.7.3

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 95 insertions, 11 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/Manifest b/media-plugins/vdr-undelete/Manifest
index e9b9bd1e6430..ba8837644ce7 100644
--- a/media-plugins/vdr-undelete/Manifest
+++ b/media-plugins/vdr-undelete/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX undelete-0.0.6-info.diff 1292 RMD160 ed54b817ec39adffeef5bbc478f0467488a08096 SHA1 e12834d32bdf9671f65043bc2ffa8dec1a37c482 SHA256 eb5f86a3800acfe546469d5cce5bb99cedf49855387d3b4212cda846b92ab5f8
 AUX undelete-0.0.6-vdr-1.5.7.diff 440 RMD160 a144e8237dcf52a54c0beb4c4d68d633392e01be SHA1 124b59d0e25697d28f92439704c5b6cb77fd7b3c SHA256 26c0be34f01d491bf07159cb364a0a2caa781f09a5dc511d018a6fdc5a8bda5c
+AUX vdr-undelete-0.0.6_vdr-1.7.3.diff 3664 RMD160 016d6b6662c8a830bba41ac3b8a4eabc230d41a9 SHA1 78c4f1c1420edd622fcb285eefee346bf6fc3865 SHA256 cdfa1364af1d8b34e170e25e155b079ee8c07f89f22f170b83ab0fb24ea7634d
 DIST vdr-undelete-0.0.6.tgz 35363 RMD160 9281fd199608baff69d55245d585ae89df2ed8cd SHA1 1f8aac9605b07a88085b6826b66027dd2a41bc8e SHA256 ce93b16e9c7c1315ddf64b8734500deb5620ffe1d3cdf94e11fa110ec8a38360
-EBUILD vdr-undelete-0.0.6-r1.ebuild 595 RMD160 e85f98b9d4393408c069201baa6667c9e71333ff SHA1 440ef6393874aabd7c69ba21213045d1946bbc72 SHA256 fa1b4e4497896a42f22edaa91333f0549ec3dc48a10ed0a35fa118f3c5522318
-MISC ChangeLog 1652 RMD160 b35addf5cc1a2bade045da07cfdf6ca198cb7082 SHA1 e371660473ad6c9c23d17ae084d0b97f403c346e SHA256 6260cb654b5b70d2312efd3120bfc22970fae44c65d3ee08f7a5a64e9c80ad1d
+EBUILD vdr-undelete-0.0.6-r1.ebuild 656 RMD160 4f0fcda8623d8e27d2fb03f1b1048ff3baeb8d98 SHA1 a4fc639751062b3a2d9340a7c862c8f734a5e998 SHA256 f46d220f845d737efdcdb780a3390256ddb3aa5851638a5e9bb5893aa2fcec1f
+MISC ChangeLog 1817 RMD160 2a5191b58abfbcd3fee9217e1772c6b020b019c4 SHA1 b6bb45e99e493ee51acdffa732e2ba02d2f9735b SHA256 74aa104b1ec262c1952b77b77f74d03bde830d0a4aefa95c63d267a4c0f7083e
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkgVk8QACgkQt2vP6XvVdOcmOwCg3/bsYT4UNypY/q1aCok3in5C
-K+0AoIWixXLgqw0+Ycw0G5ijg7h9CNau
-=/HTe
+iD8DBQFKAyMcdn07HTTCgIoRAq6pAJ4w9SM+rerYbK6/a6eClXezdfYNgQCfQNBe
+Si7oRs8yy6Ou4n7IwYt1TdI=
+=y4UL
 -----END PGP SIGNATURE-----
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" )