Make it compile also with vdr-1.5.3 and up.

Package-Manager: portage-2.1.3_rc5

3 files changed, 67 insertions, 19 deletions

diff --git a/media-plugins/vdr-timeline/ChangeLog b/media-plugins/vdr-timeline/ChangeLog
index f27369497248..1c9b98cb1dce 100644
--- a/media-plugins/vdr-timeline/ChangeLog
+++ b/media-plugins/vdr-timeline/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2007/05/10 16:13:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.12 2007/06/24 11:43:05 zzam Exp $
+
+  24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/vdr-timeline-1.0.141_vdr-1.5.x.diff:
+  Make it compile also with vdr-1.5.3 and up.
+
+  24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org> ChangeLog:
+  Make it compile also with vdr-1.5.3 and up.
 
   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:
diff --git a/media-plugins/vdr-timeline/Manifest b/media-plugins/vdr-timeline/Manifest
index 3be08d8fc902..d12b2cbeb05a 100644
--- a/media-plugins/vdr-timeline/Manifest
+++ b/media-plugins/vdr-timeline/Manifest
@@ -21,10 +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-1.0.141_vdr-1.5.x.diff 4412 RMD160 52d4236ec2ee593305a7238244eb195d676b357d SHA1 7edc31b31d795d4043a14a679a410a131ed81566 SHA256 e7cd387846bb438d40ce6b63b397ac5ffd254d529facddd93fb4dd98e344276d
+MD5 bffe45a5d010e2397aa8cd66669adad2 files/vdr-timeline-1.0.141_vdr-1.5.x.diff 4412
+RMD160 52d4236ec2ee593305a7238244eb195d676b357d files/vdr-timeline-1.0.141_vdr-1.5.x.diff 4412
+SHA256 e7cd387846bb438d40ce6b63b397ac5ffd254d529facddd93fb4dd98e344276d files/vdr-timeline-1.0.141_vdr-1.5.x.diff 4412
 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
@@ -39,10 +39,10 @@ EBUILD vdr-timeline-1.0.141.ebuild 611 RMD160 e81960a6c5011127693737d074c1172931
 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 ChangeLog 2197 RMD160 f0e393dc578e741f1451976276131b66c92e56ea SHA1 c42f280ac5f3e501fa60fb353a4a022b3c98013d SHA256 5dfd41a022f0b8beedb1bfb2f47da1339ac6132537d02d7e0edb51492731864e
+MD5 08bac724dbf75ba72336f38f1a3a0cfb ChangeLog 2197
+RMD160 f0e393dc578e741f1451976276131b66c92e56ea ChangeLog 2197
+SHA256 5dfd41a022f0b8beedb1bfb2f47da1339ac6132537d02d7e0edb51492731864e ChangeLog 2197
 MISC metadata.xml 932 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a SHA1 77f48dad9f496d48651f4ac65ba2914b0ebb5055 SHA256 24d1e8612cfb8bca76fe51eb6347e90dc503342b2b41d4ec8d14b2ea565b32a2
 MD5 28047ae9c61e73207c2e16f35fc56c4d metadata.xml 932
 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a metadata.xml 932
@@ -54,10 +54,9 @@ 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 v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGQ0TAdn07HTTCgIoRApmAAJ94CJAlg7HtYFCy7TJdKEVbYAqYYQCfTt4d
-zu3HtLGeNd8+A5mbuYYH2DE=
-=TFr3
+iD8DBQFGfljTt2vP6XvVdOcRAp6fAJ9dp5p4xyzVPv0V+ZXjMCW5iy5SZgCfXmjp
+b7w6CkMttET/8x2XKMq9hsU=
+=NUyK
 -----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
index 3cf33ce78861..6f6f1c550ff0 100644
--- 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
@@ -1,11 +1,53 @@
 http://www.vdr-portal.de/board/thread.php?postid=565546#post565546
 
 Joerg Bornkessel <hd_brummy@gentoo.org> 10 May 2007
+Matthias Schwarzott <zzam@gentoo.org> 24 Jun 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 @@
+Index: timeline-1.0.141/checkerOsd.c
+===================================================================
+--- timeline-1.0.141.orig/checkerOsd.c
++++ timeline-1.0.141/checkerOsd.c
+@@ -246,7 +246,11 @@ void checkerOsd::genLines(int day,time_t
+ 								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());
++#if APIVERSNUM >= 10503
++								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(),false),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())
+@@ -276,7 +280,11 @@ void checkerOsd::genLines(int day,time_t
+ 							{
+ 								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"));
++#if APIVERSNUM >= 10503
++								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(),false),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());
+ 							}
+ 						}
+@@ -313,9 +321,15 @@ void checkerOsd::genLines(int day,time_t
+ 							}
+ 							if (hasmatched)
+ 							{
++#if APIVERSNUM >= 10503
++								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays,false),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(),false),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(),false),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()
+@@ -338,9 +352,15 @@ void checkerOsd::genLines(int day,time_t
  							if (ch1->Frequency()!=ch2->Frequency())
  							{ // verschiedene Kanäle, genug Devices?
  								bool nofree=true;
@@ -14,7 +56,7 @@ diff -Naur timeline-1.0.141.orig/checkerOsd.c timeline-1.0.141/checkerOsd.c
 +#if APIVERSNUM >= 10500
 +                                cDevice *cd1=cDevice::GetDevice(ch1,-1,false);
 +                                cDevice *cd2=cDevice::GetDevice(ch2,-1,false);
-+#else								
++#else
  								cDevice *cd1=cDevice::GetDevice(ch1);
 -								cDevice *cd2=cDevice::GetDevice(ch2),*cdt;
 +								cDevice *cd2=cDevice::GetDevice(ch2);