patch added to work with >=vdr-1.3.37; stabel on x86

(Portage version: 2.0.54)

4 files changed, 122 insertions, 11 deletions

diff --git a/media-plugins/vdr-timeline/ChangeLog b/media-plugins/vdr-timeline/ChangeLog
index 18d5e4cfc4ca..4507193692c9 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.2 2005/12/18 22:18:16 hd_brummy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.3 2006/02/05 19:04:20 hd_brummy Exp $
+
+  05 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-1.3.37-vdr-timeline-0.9.0.diff, vdr-timeline-0.9.0-r2.ebuild:
+  patch added to work with >=vdr-1.3.37; stabel on x86
 
   18 Dec 2005; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-timeline-0.9.0-r2.ebuild:
diff --git a/media-plugins/vdr-timeline/Manifest b/media-plugins/vdr-timeline/Manifest
index 820348d5daa2..364f5a58a603 100644
--- a/media-plugins/vdr-timeline/Manifest
+++ b/media-plugins/vdr-timeline/Manifest
@@ -1,7 +1,8 @@
-MD5 ecabb7f46695ecd6e1929ff80016eed0 ChangeLog 656
-MD5 062384770da6e845313567b5c7083e43 metadata.xml 936
-MD5 a9c2acac48eeb047b26df354e74d2c6f vdr-timeline-0.9.0-r2.ebuild 854
+MD5 a7e89adae6b73fefa19a98624a9ca496 ChangeLog 842
 MD5 e2e5bde0bb92e9de8bd3b087dbdae81d files/digest-vdr-timeline-0.9.0-r2 69
 MD5 6c17a26f6bc70cda6094ced3019e13d6 files/vdr-1.3.18-vdr-timeline-0.9.0.diff 3021
 MD5 a878554b2ea0c24071543a524feb3617 files/vdr-1.3.23-vdr-timeline-0.9.0.diff 5167
 MD5 da258cf005e658ff0a661624dd95e2c6 files/vdr-1.3.32-vdr-timeline-0.9.0.diff 839
+MD5 52d88a8e01d23e6880880538eaf641c4 files/vdr-1.3.37-vdr-timeline-0.9.0.diff 5559
+MD5 062384770da6e845313567b5c7083e43 metadata.xml 936
+MD5 cc2e9d042f789875106ae9d838b07acc vdr-timeline-0.9.0-r2.ebuild 976
diff --git a/media-plugins/vdr-timeline/files/vdr-1.3.37-vdr-timeline-0.9.0.diff b/media-plugins/vdr-timeline/files/vdr-1.3.37-vdr-timeline-0.9.0.diff
new file mode 100644
index 000000000000..a1f74bb01017
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/vdr-1.3.37-vdr-timeline-0.9.0.diff
@@ -0,0 +1,105 @@
+diff -Nur timeline-0.9.0-org/checkerOsd.c timeline-0.9.0/checkerOsd.c
+--- timeline-0.9.0-org/checkerOsd.c	2005-01-02 13:24:57.000000000 +0100
++++ timeline-0.9.0/checkerOsd.c	2005-12-12 17:49:54.000000000 +0100
+@@ -228,7 +228,11 @@
+ 			{
+ 				if (showDay<0 && ct1->IsSingleEvent())
+ 				{
++#if VDRVERSNUM < 10323
+ 					showDay=ct1->Day();
++#else
++					showDay=cTimer::GetMDay(ct1->Day());
++#endif
+ 				}
+ 
+ 				for(int i=0;i<MAXDEVICES;i++)
+@@ -271,7 +275,11 @@
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
+ 								sprintf(line2,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->Priority(),ch1->Name(),ct1->File());
+-								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#if VDRVERSNUM < 10323
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#else
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else if (!ct1->IsSingleEvent() && ct2->IsSingleEvent())
+@@ -301,7 +309,11 @@
+ 							{
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
+-								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->PrintDay(ct1->Day()),ct1->Priority(),ch1->Name(),ct1->File());
++#if VDRVERSNUM < 10323
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day()),ct1->Priority(),ch1->Name(),ct1->File());
++#else
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
++#endif
+ 								sprintf(line3,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->Priority(),ch2->Name(),ct2->File());
+ 							}
+ 						}
+@@ -312,7 +324,11 @@
+ 							for(int i=0;i<6;i++)
+ 							{
+ 								hassubmatch=false;
++#if VDRVERSNUM < 10323
+ 								if (ct1->Day() & (1<<i))
++#else
++								if (ct1->WeekDays() & (1<<i))
++#endif
+ 								{
+ 									int nn=(4+i)*SECSINDAY; // 4: first Sunday after Unix time 0
+ 									start1t=ct1->SetTime(nn,ct1->TimeToInt(ct1->Start()));
+@@ -338,9 +354,15 @@
+ 							}
+ 							if (hasmatched)
+ 							{
+-								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),ct1->PrintDay(mdays|0x80000000),tr("same input device"));
+-								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->PrintDay(ct1->Day()),ct1->Priority(),ch1->Name(),ct1->File());
+-								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#if VDRVERSNUM < 10323
++								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(mdays|0x80000000),tr("same input device"));
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day()),ct1->Priority(),ch1->Name(),ct1->File());
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#else
++								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays),tr("same input device"));
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else // ct1->IsSingleEvent() && ct2->IsSingleEvent()
+@@ -574,13 +596,21 @@
+ 			ct1=Timers.First();
+ 			while (ct1)
+ 			{
++#if VDRVERSNUM < 10323
+ 				int day1=ct1->Day();
++#else
++				int day1=cTimer::GetMDay(ct1->Day());
++#endif
+ 				if (!ct1->IsSingleEvent())
+ 				{
+ 					if (ct1->DayMatches(dayt))
+ 					{
+ 						day1=day;
+ 					}
++					else
++					{
++						day1=0;
++					}
+ 				}
+ 				int start1=ct1->Start();
+ 				int stop1=ct1->Stop();
+diff -Nur timeline-0.9.0-org/checkerOsd.h timeline-0.9.0/checkerOsd.h
+--- timeline-0.9.0-org/checkerOsd.h	2004-11-30 21:12:54.000000000 +0100
++++ timeline-0.9.0/checkerOsd.h	2005-12-12 17:51:42.000000000 +0100
+@@ -11,6 +11,7 @@
+ #define CHECKEROSD_H
+ 
+ #include <vdr/plugin.h>
++#include <vdr/device.h>
+ #include <time.h>
+ #include "config.h"
+ 
diff --git a/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild b/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild
index 506b344ec1d2..024bce1f15b0 100644
--- a/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild
+++ b/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild,v 1.2 2005/12/18 22:18:16 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild,v 1.3 2006/02/05 19:04:21 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.js-home.org:80/vdr/timeline/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.0"
@@ -21,9 +21,10 @@ src_unpack() {
 	has_version ">=media-video/vdr-1.3.7" && has_version "<=media-video/vdr-1.3.22" && \
 	epatch ${FILESDIR}/vdr-1.3.18-${P}.diff
 
-	has_version ">=media-video/vdr-1.3.23" && \
+	has_version ">=media-video/vdr-1.3.23" && has_version "<=media-video/vdr-1.3.36" && \
 	epatch ${FILESDIR}/vdr-1.3.23-${P}.diff
 
-	has_version ">=media-video/vdr-1.3.32" && \
-	epatch ${FILESDIR}/vdr-1.3.32-${P}.diff
+	has_version ">=media-video/vdr-1.3.32" && epatch ${FILESDIR}/vdr-1.3.32-${P}.diff
+
+	has_version ">=media-video/vdr-1.3.37" && epatch ${FILESDIR}/vdr-1.3.37-${P}.diff
 }