summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2005-12-16 12:40:18 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2005-12-16 12:40:18 +0000
commit6120420cfc7bff4cb8633b243354ca658ff5f252 (patch)
treeeb7ca72b4cd839ee1b968adba3cd254aed8d7878 /media-plugins/vdr-timeline/files
parentRemove --with-gnu-ld option, bug #108386. (diff)
downloadhistorical-6120420cfc7bff4cb8633b243354ca658ff5f252.tar.gz
historical-6120420cfc7bff4cb8633b243354ca658ff5f252.tar.bz2
historical-6120420cfc7bff4cb8633b243354ca658ff5f252.zip
initial import, ebuild taken from gentoo.de CVS
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'media-plugins/vdr-timeline/files')
-rw-r--r--media-plugins/vdr-timeline/files/digest-vdr-timeline-0.9.0-r21
-rw-r--r--media-plugins/vdr-timeline/files/vdr-1.3.18-vdr-timeline-0.9.0.diff33
-rw-r--r--media-plugins/vdr-timeline/files/vdr-1.3.23-vdr-timeline-0.9.0.diff93
-rw-r--r--media-plugins/vdr-timeline/files/vdr-1.3.32-vdr-timeline-0.9.0.diff22
4 files changed, 149 insertions, 0 deletions
diff --git a/media-plugins/vdr-timeline/files/digest-vdr-timeline-0.9.0-r2 b/media-plugins/vdr-timeline/files/digest-vdr-timeline-0.9.0-r2
new file mode 100644
index 000000000000..1c64905a8348
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/digest-vdr-timeline-0.9.0-r2
@@ -0,0 +1 @@
+MD5 d0ee82bcc8c9e2827f92c8cf8001738c vdr-timeline-0.9.0.tar.gz 18287
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
new file mode 100644
index 000000000000..4954822283ca
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/vdr-1.3.18-vdr-timeline-0.9.0.diff
@@ -0,0 +1,33 @@
+--- 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
new file mode 100644
index 000000000000..82dc1d3df797
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/vdr-1.3.23-vdr-timeline-0.9.0.diff
@@ -0,0 +1,93 @@
+--- 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
new file mode 100644
index 000000000000..11deb41cd3fa
--- /dev/null
+++ b/media-plugins/vdr-timeline/files/vdr-1.3.32-vdr-timeline-0.9.0.diff
@@ -0,0 +1,22 @@
+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"