patch added, vdr-1.5.x readdy

Package-Manager: portage-2.1.2.2

4 files changed, 51 insertions, 16 deletions

diff --git a/media-plugins/vdr-timeline/ChangeLog b/media-plugins/vdr-timeline/ChangeLog
index a6a7c40053ac..f27369497248 100644
--- a/media-plugins/vdr-timeline/ChangeLog
+++ b/media-plugins/vdr-timeline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-timeline
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.10 2007/01/04 11:37:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.11 2007/05/10 16:13:35 hd_brummy Exp $
+
+  10 May 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-timeline-1.0.141_vdr-1.5.x.diff, vdr-timeline-1.0.141.ebuild:
+  patch added, vdr-1.5.x readdy
 
   04 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-timeline-1.0.141.ebuild:
diff --git a/media-plugins/vdr-timeline/Manifest b/media-plugins/vdr-timeline/Manifest
index f5b8ea791e26..3be08d8fc902 100644
--- a/media-plugins/vdr-timeline/Manifest
+++ b/media-plugins/vdr-timeline/Manifest
@@ -21,6 +21,10 @@ AUX vdr-timeline-1.0.141-german.diff 500 RMD160 2ea466efd3f2e8bf6ecc788485cf124e
 MD5 17e3caf47c683b197a38dccb412b9cfe files/vdr-timeline-1.0.141-german.diff 500
 RMD160 2ea466efd3f2e8bf6ecc788485cf124e91b21ac3 files/vdr-timeline-1.0.141-german.diff 500
 SHA256 ed2faeb846cf013c9b1689268a3ed0281c0d156851a4152a69ab56bebb64c6a5 files/vdr-timeline-1.0.141-german.diff 500
+AUX vdr-timeline-1.0.141_vdr-1.5.x.diff 1036 RMD160 f5dfb754d3887e4480c662769fe8c61175d0a616 SHA1 1a762504c37a9ed7bc096a8d3134320f73a75b7c SHA256 bbdaf67381450b9a23afc716b34e3d9009a6007a2268f2f4c8199b0ac196329f
+MD5 ad3ba0bad4ee0fb3fcae31655693304d files/vdr-timeline-1.0.141_vdr-1.5.x.diff 1036
+RMD160 f5dfb754d3887e4480c662769fe8c61175d0a616 files/vdr-timeline-1.0.141_vdr-1.5.x.diff 1036
+SHA256 bbdaf67381450b9a23afc716b34e3d9009a6007a2268f2f4c8199b0ac196329f files/vdr-timeline-1.0.141_vdr-1.5.x.diff 1036
 AUX vdr-timeline-fix-crash-no-timer.diff 788 RMD160 238b0fb8320557ee072cbd5c7be32381f59f5630 SHA1 688a9be08afaec5de1358f1dfee864c7503da938 SHA256 cb53aa6660d15d6087d44abde403611be7d9d97939d78a55b175df3c8000375c
 MD5 117b649572152db470845e3daa5ce8d2 files/vdr-timeline-fix-crash-no-timer.diff 788
 RMD160 238b0fb8320557ee072cbd5c7be32381f59f5630 files/vdr-timeline-fix-crash-no-timer.diff 788
@@ -31,14 +35,14 @@ EBUILD vdr-timeline-0.9.0-r2.ebuild 1036 RMD160 2fcde77ab86ef1ce4e8fdf75ecb2833d
 MD5 91764ce34d83ef9eb502735cf61b88cd vdr-timeline-0.9.0-r2.ebuild 1036
 RMD160 2fcde77ab86ef1ce4e8fdf75ecb2833dbed2fd8e vdr-timeline-0.9.0-r2.ebuild 1036
 SHA256 12aa073ed9f7a7e40e62207a5290325b344146ac648885b7538a82e62d4df2d5 vdr-timeline-0.9.0-r2.ebuild 1036
-EBUILD vdr-timeline-1.0.141.ebuild 595 RMD160 3637121119a1eaaa14e5eb611100fffca1903c2f SHA1 b98445de592b4bbdd3d0a95f05b67209dfcc6e4e SHA256 0b750ec4529cdc0a4cff699b94c296a0059aa914c8d56937a6bc31f5fbf355b7
-MD5 18e5aa66e2de26c2194272668932c691 vdr-timeline-1.0.141.ebuild 595
-RMD160 3637121119a1eaaa14e5eb611100fffca1903c2f vdr-timeline-1.0.141.ebuild 595
-SHA256 0b750ec4529cdc0a4cff699b94c296a0059aa914c8d56937a6bc31f5fbf355b7 vdr-timeline-1.0.141.ebuild 595
-MISC ChangeLog 1778 RMD160 20b2817a59c67fc4121d372077c6682340c4fc4a SHA1 726630f623ea8d00bbaa5348e6708c7cfd1c0336 SHA256 c57f47baab24d374c848c55f2c1b2f48b3081f4e3cf5e1b7afb51dc5dcdd7b81
-MD5 0bf10ffc91c0cb7aa7e17b9b7f5fc7d1 ChangeLog 1778
-RMD160 20b2817a59c67fc4121d372077c6682340c4fc4a ChangeLog 1778
-SHA256 c57f47baab24d374c848c55f2c1b2f48b3081f4e3cf5e1b7afb51dc5dcdd7b81 ChangeLog 1778
+EBUILD vdr-timeline-1.0.141.ebuild 611 RMD160 e81960a6c5011127693737d074c11729316752a5 SHA1 3915b1b24ec7ec90d0b0cc4913de6b6084fd4070 SHA256 2c838c98ee9c3a09f46584388909c5518f28fcdceba6b0a85e839cbaf4ec6966
+MD5 17a945f606a980de6d259fab515b4c16 vdr-timeline-1.0.141.ebuild 611
+RMD160 e81960a6c5011127693737d074c11729316752a5 vdr-timeline-1.0.141.ebuild 611
+SHA256 2c838c98ee9c3a09f46584388909c5518f28fcdceba6b0a85e839cbaf4ec6966 vdr-timeline-1.0.141.ebuild 611
+MISC ChangeLog 1946 RMD160 4ccb7bc75401ff5908ce2ca7f7482921a9948a64 SHA1 203454d7b658e5aee913c62f1bdce2d915365b35 SHA256 128001f2572078a2ada16a4b17b860c3129c0fee633dc02555514dbda8ce6d6a
+MD5 5da06e16b570194899e1844038d4d73e ChangeLog 1946
+RMD160 4ccb7bc75401ff5908ce2ca7f7482921a9948a64 ChangeLog 1946
+SHA256 128001f2572078a2ada16a4b17b860c3129c0fee633dc02555514dbda8ce6d6a ChangeLog 1946
 MISC metadata.xml 932 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a SHA1 77f48dad9f496d48651f4ac65ba2914b0ebb5055 SHA256 24d1e8612cfb8bca76fe51eb6347e90dc503342b2b41d4ec8d14b2ea565b32a2
 MD5 28047ae9c61e73207c2e16f35fc56c4d metadata.xml 932
 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a metadata.xml 932
@@ -50,9 +54,10 @@ MD5 7b3499a3f42ea777e56e0f8c50c38663 files/digest-vdr-timeline-1.0.141 259
 RMD160 9815a8d390af20b8915334f2f31b4587d6047f06 files/digest-vdr-timeline-1.0.141 259
 SHA256 50c5751a65a42aa607e092974e4863555e6a8be7937e5c614de4b2357d1ef0a2 files/digest-vdr-timeline-1.0.141 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFFnObxt2vP6XvVdOcRAhlDAKDatGQAm3jTCZhAyRaaPU6oJmwJawCeL2zW
-+9uKabsvnluSOJrTxGrpxDM=
-=XzXm
+iD8DBQFGQ0TAdn07HTTCgIoRApmAAJ94CJAlg7HtYFCy7TJdKEVbYAqYYQCfTt4d
+zu3HtLGeNd8+A5mbuYYH2DE=
+=TFr3
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141_vdr-1.5.x.diff b/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141_vdr-1.5.x.diff
new file mode 100644
index 000000000000..3cf33ce78861
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141_vdr-1.5.x.diff
@@ -0,0 +1,25 @@
+http://www.vdr-portal.de/board/thread.php?postid=565546#post565546
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 10 May 2007
+
+diff -Naur timeline-1.0.141.orig/checkerOsd.c timeline-1.0.141/checkerOsd.c
+--- timeline-1.0.141.orig/checkerOsd.c	2007-05-10 18:04:03.701564938 +0200
++++ timeline-1.0.141/checkerOsd.c	2007-05-10 18:07:40.290012641 +0200
+@@ -338,9 +338,15 @@
+ 							if (ch1->Frequency()!=ch2->Frequency())
+ 							{ // verschiedene Kanäle, genug Devices?
+ 								bool nofree=true;
+-								
++
++#if APIVERSNUM >= 10500
++                                cDevice *cd1=cDevice::GetDevice(ch1,-1,false);
++                                cDevice *cd2=cDevice::GetDevice(ch2,-1,false);
++#else								
+ 								cDevice *cd1=cDevice::GetDevice(ch1);
+-								cDevice *cd2=cDevice::GetDevice(ch2),*cdt;
++								cDevice *cd2=cDevice::GetDevice(ch2);
++#endif
++								cDevice *cdt;
+ 								if (cd1->DeviceNumber()!=cd2->DeviceNumber())
+ 								{ // Sonderfall: ch2 kann gar nicht auf Device von ch1 empfangen werden
+ 									nofree=false;
diff --git a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild b/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild
index 663d4402b5fc..4f5b6839c3b9 100644
--- a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild
+++ b/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild,v 1.4 2007/01/04 11:37:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild,v 1.5 2007/05/10 16:13:35 hd_brummy Exp $
 
 inherit vdr-plugin
 
-DESCRIPTION="Video Disk Recorder Timeline PlugIn"
+DESCRIPTION="VDR plugin: Timeline"
 HOMEPAGE="http://www.js-home.org/vdr/timeline/"
 SRC_URI="http://www.js-home.org:80/vdr/timeline/${P}.tar.gz"
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 PATCHES="${FILESDIR}/${P}-german.diff
-	${FILESDIR}/vdr-timeline-fix-crash-no-timer.diff"
+	${FILESDIR}/${PN}-fix-crash-no-timer.diff
+	${FILESDIR}/${P}_vdr-1.5.x.diff"
 
 DEPEND=">=media-video/vdr-1.4.1"