use eapi=2; compile fix for >=vdr-1.7.3

(Portage version: 2.1.6.11/cvs/Linux i686)

3 files changed, 73 insertions, 4 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index 97b52dc76723..72f4088473cd 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-vompserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.12 2009/02/18 21:35:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.13 2009/05/07 17:56:46 hd_brummy Exp $
+
+  07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-vompserver-0.3.0.ebuild,
+  +files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff:
+  use eapi=2; compile fix for >=vdr-1.7.3
 
 *vdr-vompserver-0.3.0 (18 Feb 2009)
 
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff
new file mode 100644
index 000000000000..cba6275939e1
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff
@@ -0,0 +1,59 @@
+compile fix for >=vdr-1..3
+suggested by T.Ghuenter
+Joerg Bornkessel <hd_brummy@gento.org> 07 May 2009
+diff -Naur vompserver-0.3.0.orig/recplayer.c vompserver-0.3.0/recplayer.c
+--- vompserver-0.3.0.orig/recplayer.c	2009-05-07 19:48:18.592438442 +0200
++++ vompserver-0.3.0/recplayer.c	2009-05-07 19:49:26.375764634 +0200
+@@ -34,7 +34,11 @@
+ 
+   // FIXME find out max file path / name lengths
+ 
++#if VDRVERSNUM >= 10703
++  indexFile = new cIndexFile(recording->FileName(), false, rec->IsPesRecording());
++#else
+   indexFile = new cIndexFile(recording->FileName(), false);
++#endif
+   if (!indexFile) log->log("RecPlayer", Log::ERR, "Failed to create indexfile!");
+ 
+   scan();
+@@ -193,12 +197,19 @@
+ {
+   if (!indexFile) return 0;
+ 
++#if VDRVERSNUM >= 10703
++  uint16_t retFileNumber;
++  off_t retFileOffset;
++
++  if (!indexFile->Get((int)frameNumber, &retFileNumber, &retFileOffset))
++#else
+   uchar retFileNumber;
+   int retFileOffset;
+   uchar retPicType;
+   int retLength;
+ 
+   if (!indexFile->Get((int)frameNumber, &retFileNumber, &retFileOffset, &retPicType, &retLength))
++#endif
+   {
+     return 0;
+   }
+@@ -240,6 +251,12 @@
+ 
+   if (!indexFile) return false;
+ 
++#if VDRVERSNUM >= 10703
++  int iframeLength;
++  int indexReturnFrameNumber;
++
++  indexReturnFrameNumber = (ULONG)indexFile->GetNextIFrame(frameNumber, (direction==1 ? true : false), NULL, NULL, &iframeLength);
++#else
+   uchar waste1;
+   int waste2;
+ 
+@@ -247,6 +264,7 @@
+   int indexReturnFrameNumber;
+ 
+   indexReturnFrameNumber = (ULONG)indexFile->GetNextIFrame(frameNumber, (direction==1 ? true : false), &waste1, &waste2, &iframeLength);
++#endif
+   log->log("RecPlayer", Log::DEBUG, "GNIF input framenumber:%lu, direction=%lu, output:framenumber=%i, framelength=%i", frameNumber, direction, indexReturnFrameNumber, iframeLength);
+ 
+   if (indexReturnFrameNumber == -1) return false;
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild
index 1f4fb6cb172f..99b6e2cb9b29 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild,v 1.1 2009/02/18 21:35:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild,v 1.2 2009/05/07 17:56:46 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -14,9 +16,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6"
+RDEPEND="${DEPEND}"
+
+PATCHES="${FILESDIR}/${P}_vdr-1.7.3-compile.diff"
 
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
 }