diff options
author | 2013-11-26 21:09:06 +0000 | |
---|---|---|
committer | 2013-11-26 21:09:06 +0000 | |
commit | 2430f75c8674f8524261c7fa046d898dd169b1b6 (patch) | |
tree | bd124985a5bf117f05cf6757aeeb4d0fc8e0d108 /media-plugins | |
parent | media-plugins/vdr-taste removal (pending 15 Sep 2013), see #414269 #414177 fo... (diff) | |
download | historical-2430f75c8674f8524261c7fa046d898dd169b1b6.tar.gz historical-2430f75c8674f8524261c7fa046d898dd169b1b6.tar.bz2 historical-2430f75c8674f8524261c7fa046d898dd169b1b6.zip |
media-plugins/vdr-timeline removal (pending 15 Sep 2013), see #414261 #414177 for referency
Diffstat (limited to 'media-plugins')
12 files changed, 0 insertions, 509 deletions
diff --git a/media-plugins/vdr-timeline/ChangeLog b/media-plugins/vdr-timeline/ChangeLog deleted file mode 100644 index 1c9b98cb1dce..000000000000 --- a/media-plugins/vdr-timeline/ChangeLog +++ /dev/null @@ -1,61 +0,0 @@ -# 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.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: - patch added, vdr-1.5.x readdy - - 04 Jan 2007; Matthias Schwarzott <zzam@gentoo.org> - vdr-timeline-1.0.141.ebuild: - Marked stable on x86. - - 16 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-timeline-fix-crash-no-timer.diff, vdr-timeline-0.9.0-r2.ebuild, - vdr-timeline-1.0.141.ebuild: - Fix crash when no timer is defined and one presses a number key. - - 16 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/vdr-timeline-1.0.141-german.diff, vdr-timeline-1.0.141.ebuild: - Added german translation. - -*vdr-timeline-1.0.141 (16 Nov 2006) - - 16 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> - +vdr-timeline-1.0.141.ebuild: - Version bumped. - - 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml: - Assigned to Gentoo VDR Project. - - 27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest: - Fixing SHA256 digest, pass four - - 17 Apr 2006; Matthias Schwarzott <zzam@gentoo.org> - vdr-timeline-0.9.0-r2.ebuild: - Included eutils.eclass - - 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: - typo fixed - -*vdr-timeline-0.9.0-r2 (16 Dec 2005) - - 16 Dec 2005; Joerg Bornkessel <hd_brummy@gentoo.org> - +files/vdr-1.3.18-vdr-timeline-0.9.0.diff, - +files/vdr-1.3.23-vdr-timeline-0.9.0.diff, - +files/vdr-1.3.32-vdr-timeline-0.9.0.diff, +metadata.xml, - +vdr-timeline-0.9.0-r2.ebuild: - initial import, ebuild taken from gentoo.de CVS - diff --git a/media-plugins/vdr-timeline/Manifest b/media-plugins/vdr-timeline/Manifest deleted file mode 100644 index f12fca70d0fe..000000000000 --- a/media-plugins/vdr-timeline/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX vdr-1.3.18-vdr-timeline-0.9.0.diff 3021 RMD160 b994d1546f0f44006513f23ee4a8ce6d4dd9484b SHA1 75fdd26e52b8e66e1a475216519067fce3f9c7e4 SHA256 8e5459e46c45754984f1a00505e8a7044ef0996a877f9ee37ae82895e23dfdc2 -AUX vdr-1.3.23-vdr-timeline-0.9.0.diff 5167 RMD160 1b55303ee93641b69504ddcd0291224f5aa4d5b5 SHA1 80a8fb174c73dec0c3d2bd135450516ec91afd8b SHA256 ec99229a5d7d1d3ff7887b97e9c16c308fb8296ac7f6257a360ac1a22be88eab -AUX vdr-1.3.32-vdr-timeline-0.9.0.diff 839 RMD160 7778969d532fb12f9af688357a86de916c19a631 SHA1 420243ac3778c9e340b655a5b1dae46a6409c7b0 SHA256 a09bd348e6639c9600a0141ae85b99ced22afa9c7a4ae7ef1580e6987b14b98e -AUX vdr-1.3.37-vdr-timeline-0.9.0.diff 5559 RMD160 534be275b16d3f32d9323a38357188023318e3e9 SHA1 e8d9cf17714736e1ba3c193e20ebe5467ec7d250 SHA256 9b771568de2eb479e786e26c85c7c82a91a9b668c6c10e8b6cf5692e16bcbcd9 -AUX vdr-timeline-1.0.141-german.diff 500 RMD160 2ea466efd3f2e8bf6ecc788485cf124e91b21ac3 SHA1 cbd4fff02268770ed5f690a8f00fb09dd72cb3bd SHA256 ed2faeb846cf013c9b1689268a3ed0281c0d156851a4152a69ab56bebb64c6a5 -AUX vdr-timeline-1.0.141_vdr-1.5.x.diff 4412 RMD160 52d4236ec2ee593305a7238244eb195d676b357d SHA1 7edc31b31d795d4043a14a679a410a131ed81566 SHA256 e7cd387846bb438d40ce6b63b397ac5ffd254d529facddd93fb4dd98e344276d -AUX vdr-timeline-fix-crash-no-timer.diff 788 RMD160 238b0fb8320557ee072cbd5c7be32381f59f5630 SHA1 688a9be08afaec5de1358f1dfee864c7503da938 SHA256 cb53aa6660d15d6087d44abde403611be7d9d97939d78a55b175df3c8000375c -DIST vdr-timeline-0.9.0.tar.gz 18287 RMD160 aba1567def19cc70601ff45a60a2127361c83c5d SHA1 366df0e3b1dd72b0661198c8e0ee71a8449409bc SHA256 cb48912a83fbf57c8b5fc42d4c992f7cdb3d88bb9b9f7f4e5fd08e32dc7fd369 -DIST vdr-timeline-1.0.141.tar.gz 17417 RMD160 84afbd1f014d81f07777e8c5f3b1a8482562d1dc SHA1 d079816c93f33e61c11675c584d4dd641fea6763 SHA256 8f3255ffbf1aaeab22109fa0bfc6a59c22c37323bb31c0efb76fc42118954d0f -EBUILD vdr-timeline-0.9.0-r2.ebuild 1036 RMD160 2fcde77ab86ef1ce4e8fdf75ecb2833dbed2fd8e SHA1 6bb58a3fe475cc97991b7c7dd7f593e4f941f8ab SHA256 12aa073ed9f7a7e40e62207a5290325b344146ac648885b7538a82e62d4df2d5 -EBUILD vdr-timeline-1.0.141.ebuild 610 RMD160 34468bc346424246d88ae63230652dd4efe58712 SHA1 36d22a552d77a671d1eb3f6a38073ff3bd27a6f9 SHA256 1e684994a771d801fd98474b0b1ac1fa7a209b1994632b41c4091ecf30ed8e8d -MISC ChangeLog 2197 RMD160 f0e393dc578e741f1451976276131b66c92e56ea SHA1 c42f280ac5f3e501fa60fb353a4a022b3c98013d SHA256 5dfd41a022f0b8beedb1bfb2f47da1339ac6132537d02d7e0edb51492731864e -MISC metadata.xml 932 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a SHA1 77f48dad9f496d48651f4ac65ba2914b0ebb5055 SHA256 24d1e8612cfb8bca76fe51eb6347e90dc503342b2b41d4ec8d14b2ea565b32a2 diff --git a/media-plugins/vdr-timeline/files/vdr-1.3.18-vdr-timeline-0.9.0.diff b/media-plugins/vdr-timeline/files/vdr-1.3.18-vdr-timeline-0.9.0.diff deleted file mode 100644 index 4954822283ca..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-1.3.18-vdr-timeline-0.9.0.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- timeline-0.9.0/checkerOsd.c.orig 2005-02-11 08:03:12.898943092 +0100 -+++ timeline-0.9.0/checkerOsd.c 2005-02-11 08:10:15.866962831 +0100 -@@ -271,7 +271,7 @@ - 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()); -+ 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 if (!ct1->IsSingleEvent() && ct2->IsSingleEvent()) -@@ -301,7 +301,7 @@ - { - 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()); -+ 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, (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->Priority(),ch2->Name(),ct2->File()); - } - } -@@ -338,9 +338,9 @@ - } - 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()); -+ 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 // ct1->IsSingleEvent() && ct2->IsSingleEvent() diff --git a/media-plugins/vdr-timeline/files/vdr-1.3.23-vdr-timeline-0.9.0.diff b/media-plugins/vdr-timeline/files/vdr-1.3.23-vdr-timeline-0.9.0.diff deleted file mode 100644 index 82dc1d3df797..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-1.3.23-vdr-timeline-0.9.0.diff +++ /dev/null @@ -1,93 +0,0 @@ ---- timeline-0.9.0/checkerOsd.c -+++ timeline-0.9.0/checkerOsd.c -@@ -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 --git a/media-plugins/vdr-timeline/files/vdr-1.3.32-vdr-timeline-0.9.0.diff b/media-plugins/vdr-timeline/files/vdr-1.3.32-vdr-timeline-0.9.0.diff deleted file mode 100644 index 11deb41cd3fa..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-1.3.32-vdr-timeline-0.9.0.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru vdr-1.3.32-orig/PLUGINS/src/timeline-0.9.0/checkerOsd.c vdr-1.3.32/PLUGINS/src/timeline-0.9.0/checkerOsd.c ---- vdr-1.3.32-orig/PLUGINS/src/timeline-0.9.0/checkerOsd.c 2005-03-25 08:29:26.000000000 -0800 -+++ vdr-1.3.32/PLUGINS/src/timeline-0.9.0/checkerOsd.c 2005-09-11 13:45:49.000000000 -0700 -@@ -7,6 +7,7 @@ - * - */ - -+#include <vdr/device.h> - #include "checkerOsd.h" - - #define HEADINFO "(c) JS" -diff -ru vdr-1.3.32-orig/PLUGINS/src/timeline-0.9.0/timeline.c vdr-1.3.32/PLUGINS/src/timeline-0.9.0/timeline.c ---- vdr-1.3.32-orig/PLUGINS/src/timeline-0.9.0/timeline.c 2005-01-02 14:44:23.000000000 -0800 -+++ vdr-1.3.32/PLUGINS/src/timeline-0.9.0/timeline.c 2005-09-11 13:42:25.000000000 -0700 -@@ -8,6 +8,7 @@ - */ - - #include <vdr/plugin.h> -+#include <vdr/device.h> - #include "checkerOsd.h" - #include "config.h" - #include "i18n.h" 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 deleted file mode 100644 index a1f74bb01017..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-1.3.37-vdr-timeline-0.9.0.diff +++ /dev/null @@ -1,105 +0,0 @@ -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/files/vdr-timeline-1.0.141-german.diff b/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141-german.diff deleted file mode 100644 index 620fd978cb88..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141-german.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru timeline-1.0.141-orig/i18n.c timeline-1.0.141/i18n.c ---- timeline-1.0.141-orig/i18n.c 2006-11-16 14:06:30.000000000 +0100 -+++ timeline-1.0.141/i18n.c 2006-11-16 14:09:05.000000000 +0100 -@@ -33,7 +33,7 @@ - "", - }, - { "Show timer overview and collisions", -- "", -+ "Überblick über Timer/Kollisionen", - "", - "", - "", -@@ -121,7 +121,7 @@ - "", - }, - { "same input device", -- "gleiche Eingangs-Device", -+ "gleiches Eingangs-Gerät", - "", - "", - "", 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 deleted file mode 100644 index 6f6f1c550ff0..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-timeline-1.0.141_vdr-1.5.x.diff +++ /dev/null @@ -1,67 +0,0 @@ -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 - -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; -- -+ -+#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/files/vdr-timeline-fix-crash-no-timer.diff b/media-plugins/vdr-timeline/files/vdr-timeline-fix-crash-no-timer.diff deleted file mode 100644 index 59ec4a3476f3..000000000000 --- a/media-plugins/vdr-timeline/files/vdr-timeline-fix-crash-no-timer.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru timeline-1.0.141-orig/checkerOsd.c timeline-1.0.141/checkerOsd.c ---- timeline-1.0.141-orig/checkerOsd.c 2006-11-16 14:39:23.000000000 +0100 -+++ timeline-1.0.141/checkerOsd.c 2006-11-16 14:40:25.000000000 +0100 -@@ -457,6 +457,9 @@ - osd->DrawRectangle(areas[0].x1, areas[0].y1, areas[0].x2, areas[0].y2, clrGray50); - osd->DrawText(x0_graph+width_graph-cFont::GetFont(fontSml)->Width(navtxt),y0_graph,navtxt,clrWhite,clrBlue,cFont::GetFont(fontSml)); - -+ for(int i=0;i<10;i++) -+ quicktimer[i]=NULL; -+ - if (Timers.Count()>0) - { - int graph_border=15; -@@ -501,8 +504,6 @@ - cTimer *ct1; - struct paintdata *pd=new paintdata[2401]; - -- for(int i=0;i<10;i++) -- quicktimer[i]=NULL; - for(int i=0;i<MAXRECORDS;i++) - recordingtimer[i].timer=NULL; - for(int i=0;i<2401;i++) diff --git a/media-plugins/vdr-timeline/metadata.xml b/media-plugins/vdr-timeline/metadata.xml deleted file mode 100644 index 9e1f30c97ee3..000000000000 --- a/media-plugins/vdr-timeline/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>media-tv</herd> - <maintainer> - <email>vdr@gentoo.org</email> - <name>Gentoo VDR Project</name> - </maintainer> - <longdescription lang="en"> - Plugin shows a time border of all records on one day and possible - conflicts of transmissions at the same time over the same DEVICE - (DVB map, etc..) - </longdescription> - <longdescription lang="de"> - Zeigt eine Zeitleiste aller Aufnahmen an einem Tag und eventuelle - Konflikte von Sendungen, die gleichzeitig ueber das gleiche Device - (DVB-Karte, etc.) jedoch von unterschiedlichen Sendern - (unterschiedliche Digitalpakete) aufgenommen werden sollen. - </longdescription> -</pkgmetadata> 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 deleted file mode 100644 index 6150dbda60e0..000000000000 --- a/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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.5 2006/11/16 13:44:57 zzam Exp $ - -inherit vdr-plugin eutils - -DESCRIPTION="Video Disk Recorder Timeline PlugIn" -HOMEPAGE="http://www.js-home.org/vdr/timeline/" -SRC_URI="http://www.js-home.org:80/vdr/timeline/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64" -IUSE="" - -DEPEND=">=media-video/vdr-1.2.0" - -src_unpack() { - vdr-plugin_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.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.37" && epatch ${FILESDIR}/vdr-1.3.37-${P}.diff - - epatch ${FILESDIR}/vdr-timeline-fix-crash-no-timer.diff -} diff --git a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild b/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild deleted file mode 100644 index b829257863bd..000000000000 --- a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# 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.6 2007/07/10 23:09:00 mr_bones_ Exp $ - -inherit vdr-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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -PATCHES="${FILESDIR}/${P}-german.diff - ${FILESDIR}/${PN}-fix-crash-no-timer.diff - ${FILESDIR}/${P}_vdr-1.5.x.diff" - -DEPEND=">=media-video/vdr-1.4.1" |