Added patch to work with vdr-1.3.42 and greater - Thanks to Harri Kaimio <harri@kaimio.fi> - See Bug #128867

(Portage version: 2.1_pre7-r5)

4 files changed, 47 insertions, 15 deletions

diff --git a/media-plugins/vdr-pvr350/ChangeLog b/media-plugins/vdr-pvr350/ChangeLog
index 835975e1ece4..b5783b41b0bb 100644
--- a/media-plugins/vdr-pvr350/ChangeLog
+++ b/media-plugins/vdr-pvr350/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-pvr350
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.1 2006/03/21 13:54:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.2 2006/04/14 23:08:18 zzam Exp $
+
+  14 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff,
+  vdr-pvr350-0.0.4_pre1.ebuild:
+  Added patch to work with vdr-1.3.42 and greater - Thanks to Harri Kaimio
+  <harri@kaimio.fi> - See Bug #128867
 
 *vdr-pvr350-0.0.4_pre1 (21 Mar 2006)
 
diff --git a/media-plugins/vdr-pvr350/Manifest b/media-plugins/vdr-pvr350/Manifest
index 0de93a59da5f..796a4a592356 100644
--- a/media-plugins/vdr-pvr350/Manifest
+++ b/media-plugins/vdr-pvr350/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 79cee7bd3fa3447ed99145bb933944ea ChangeLog 386
 RMD160 edadeae19c9fbd0412099a8a460c82532509e184 ChangeLog 386
 SHA256 44afd3fc2e78113935264ffd4ebec4baa146332140e45adca4dc0bd496ce06ec ChangeLog 386
 MD5 b37ad40b9cc51e8a3b9eef70ddf1ded8 files/digest-vdr-pvr350-0.0.4_pre1 250
 RMD160 6d279875e54654101f8cde29568312679781d9a3 files/digest-vdr-pvr350-0.0.4_pre1 250
 SHA256 473f3bcdb681e1dfd82ce085d99008c3db6e307c2e2f6c4c5787984522950e62 files/digest-vdr-pvr350-0.0.4_pre1 250
+MD5 643647ed3a16524a6d293c7848e8ca07 files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff 1213
+RMD160 3d9510bede0338673bb51d4786c61317e36b3671 files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff 1213
+SHA256 e2be42a949223ad5855bda68cd41919ac0fdd29c27a3c52542d41ce94312b4cd files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff 1213
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
 SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
-MD5 01a796293a23e2d37a29e2cddad1c09e vdr-pvr350-0.0.4_pre1.ebuild 952
-RMD160 6210a6f93201f93353e039a8988c80dc739a1db6 vdr-pvr350-0.0.4_pre1.ebuild 952
-SHA256 38684863908ed0f7992f58cd1ff98b1ad6c26e146d197be2572486fa8b332315 vdr-pvr350-0.0.4_pre1.ebuild 952
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIAW6ZfSl1Kp5KmoRAl8CAKCm9PYUjywffJX+LlRIJmE+lVJeTQCbBfFU
-Ejlalj5fJb7CwWHIKbLhISE=
-=Lg9T
------END PGP SIGNATURE-----
+MD5 c56bf3fa10ce29f96ac69472d24392eb vdr-pvr350-0.0.4_pre1.ebuild 994
+RMD160 b8cee2957d0ddbced11c31069d52943bc7dbad66 vdr-pvr350-0.0.4_pre1.ebuild 994
+SHA256 bfda1460c86ecb749a4aa512b9a3b20359dcf494aa3d8f0ae3d70ba27c821aac vdr-pvr350-0.0.4_pre1.ebuild 994
diff --git a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff
new file mode 100644
index 000000000000..ce5f006c3ca6
--- /dev/null
+++ b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff
@@ -0,0 +1,31 @@
+diff -ur pvr350-0.0.4pre1/device.c /tmp/pvr350-0.0.4pre1/device.c
+--- pvr350-0.0.4pre1/device.c   2005-02-12 21:15:16.000000000 +0200
++++ /tmp/pvr350-0.0.4pre1/device.c      2006-04-05 09:08:54.000000000 +0300
+@@ -321,7 +321,11 @@
+    streams to find out the aspect ratio that's needed
+ */
+ #if VDRVERSNUM >= 10318
++#if VDRVERSNUM >= 10342
++int cPvr350Device::PlayAudio(const uchar *Data, int Length, uchar id )
++#else
+ int cPvr350Device::PlayAudio(const uchar *Data, int Length)
++#endif
+ {
+        return PlayVideo(Data,Length);
+ }
+diff -ur pvr350-0.0.4pre1/device.h /tmp/pvr350-0.0.4pre1/device.h
+--- pvr350-0.0.4pre1/device.h   2005-02-12 21:14:25.000000000 +0200
++++ /tmp/pvr350-0.0.4pre1/device.h      2006-04-05 09:11:46.000000000 +0300
+@@ -74,8 +74,12 @@
+     virtual void StillPicture(const uchar *Data, int Length);
+     virtual int PlayVideo(const uchar *Data, int Length);
+ #if VDRVERSNUM > 10318
++#if VDRVERSNUM >= 10342
++    virtual int PlayAudio( const uchar *Data, int Length, uchar id );
++#else
+     virtual int PlayAudio(const uchar *Data, int Length);
+ #endif
++#endif
+     virtual void SetVideoFormat(bool VideoFormat16_9);
+     virtual void SetVolumeDevice(int Volume);
+ #if VDRVERSNUM < 10307
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
index d35189643628..7f85dc0d4ebe 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild,v 1.1 2006/03/21 13:54:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild,v 1.2 2006/04/14 23:08:18 zzam Exp $
 inherit vdr-plugin
 
 IUSE="yaepg"
@@ -35,5 +35,7 @@ src_unpack() {
 	vdr-plugin_src_unpack
 
 	sed -e 's/-I$(LIBAVCODEC)//' -i Makefile
+
+	epatch ${FILESDIR}/${P}-vdr-1.3.42.diff
 }