diff options
Diffstat (limited to 'media-plugins/vdr-epgsearch/files')
4 files changed, 192 insertions, 0 deletions
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff new file mode 100644 index 000000000000..3a8babbc16fb --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff @@ -0,0 +1,32 @@ +--- epgsearch/conflictcheck.h.bak 2012-03-03 15:33:15.000000000 +0100 ++++ epgsearch/conflictcheck.h 2012-03-03 15:35:43.000000000 +0100 +@@ -169,12 +169,12 @@ + result = true; + #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE + else +- result = Priority >= Setup.PrimaryLimit; ++ result = Priority >= 0; + #endif + #endif + } + else +- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; ++ result = !IsPrimaryDevice() || Priority >= 0; + } + else + needsDetachReceivers = true; +@@ -259,12 +259,12 @@ + result = true; + #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE + else +- result = Priority >= Setup.PrimaryLimit; ++ result = Priority >= 0; + #endif + #endif + } + else +- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; ++ result = !IsPrimaryDevice() || Priority >= 0; + } + else + needsDetachReceivers = true; diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff new file mode 100644 index 000000000000..aa51685cb282 --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.33.diff @@ -0,0 +1,120 @@ +diff -Naur epgsearch-1.0.0.orig/epgsearchsvdrp.c epgsearch-1.0.0/epgsearchsvdrp.c +--- epgsearch-1.0.0.orig/epgsearchsvdrp.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/epgsearchsvdrp.c 2012-12-15 11:44:38.000000000 +0100 +@@ -564,7 +564,7 @@ + strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r)); + strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r)); + +- int timerMatch; ++ eTimerMatch timerMatch; + bool hasTimer = false; + if (Timers.GetMatch(pEvent, &timerMatch)) + hasTimer = (timerMatch == tmFull); +diff -Naur epgsearch-1.0.0.orig/mail.c epgsearch-1.0.0/mail.c +--- epgsearch-1.0.0.orig/mail.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/mail.c 2012-12-15 11:45:02.000000000 +0100 +@@ -49,7 +49,7 @@ + const cEvent* pEvent = GetEvent(); + if (!pEvent) return ""; + +- int TimerMatch = tmNone; ++ eTimerMatch TimerMatch = tmNone; + cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch); + if (!pTimer) return ""; + +diff -Naur epgsearch-1.0.0.orig/menu_commands.c epgsearch-1.0.0/menu_commands.c +--- epgsearch-1.0.0.orig/menu_commands.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_commands.c 2012-12-15 11:45:40.000000000 +0100 +@@ -121,7 +121,7 @@ + { + if (!event) return osContinue; + +- int timerMatch = tmNone; ++ eTimerMatch timerMatch = tmNone; + cTimer* timer = Timers.GetMatch(event, &timerMatch); + if (timerMatch == tmFull) + { +diff -Naur epgsearch-1.0.0.orig/menu_event.c epgsearch-1.0.0/menu_event.c +--- epgsearch-1.0.0.orig/menu_event.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_event.c 2012-12-15 11:46:17.000000000 +0100 +@@ -92,7 +92,7 @@ + cEventObj* eventObjPrev = GetPrev(event); + cEventObj* eventObjNext = GetNext(event); + +- int timerMatch = tmNone; ++ eTimerMatch timerMatch = tmNone; + Timers.GetMatch(event, &timerMatch); + const char* szRed = trVDR("Button$Record"); + if (timerMatch == tmFull) +diff -Naur epgsearch-1.0.0.orig/menu_main.c epgsearch-1.0.0/menu_main.c +--- epgsearch-1.0.0.orig/menu_main.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_main.c 2012-12-15 11:47:08.000000000 +0100 +@@ -181,7 +181,7 @@ + if (item) { + if (item->timerMatch == tmFull) + { +- int tm = tmNone; ++ eTimerMatch tm = tmNone; + cTimer *timer = Timers.GetMatch(item->event, &tm); + if (timer) + { +diff -Naur epgsearch-1.0.0.orig/menu_searchresults.c epgsearch-1.0.0/menu_searchresults.c +--- epgsearch-1.0.0.orig/menu_searchresults.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_searchresults.c 2012-12-15 11:51:12.000000000 +0100 +@@ -217,7 +217,7 @@ + if (item) { + if (item->timerMatch == tmFull) + { +- int tm = tmNone; ++ eTimerMatch tm = tmNone; + cTimer *timer = Timers.GetMatch(item->event, &tm); + if (timer) + { +diff -Naur epgsearch-1.0.0.orig/menu_searchresults.h epgsearch-1.0.0/menu_searchresults.h +--- epgsearch-1.0.0.orig/menu_searchresults.h 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_searchresults.h 2012-12-15 11:51:57.000000000 +0100 +@@ -50,7 +50,7 @@ + bool episodeOnly; + cMenuTemplate* menuTemplate; + public: +- int timerMatch; ++ eTimerMatch timerMatch; + bool inSwitchList; + const cEvent *event; + const cSearchExt* search; +diff -Naur epgsearch-1.0.0.orig/menu_whatson.c epgsearch-1.0.0/menu_whatson.c +--- epgsearch-1.0.0.orig/menu_whatson.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_whatson.c 2012-12-15 11:52:37.000000000 +0100 +@@ -527,7 +527,7 @@ + { + if (item->timerMatch == tmFull) + { +- int tm = tmNone; ++ eTimerMatch tm = tmNone; + cTimer *timer = Timers.GetMatch(item->event, &tm); + if (timer) + { +diff -Naur epgsearch-1.0.0.orig/menu_whatson.h epgsearch-1.0.0/menu_whatson.h +--- epgsearch-1.0.0.orig/menu_whatson.h 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/menu_whatson.h 2012-12-15 11:53:09.000000000 +0100 +@@ -35,7 +35,7 @@ + const cEvent *event; + cChannel *channel; + showMode mode; +- int timerMatch; ++ eTimerMatch timerMatch; + bool inSwitchList; + cMenuTemplate* menuTemplate; + +diff -Naur epgsearch-1.0.0.orig/services.c epgsearch-1.0.0/services.c +--- epgsearch-1.0.0.orig/services.c 2012-12-15 11:42:41.000000000 +0100 ++++ epgsearch-1.0.0/services.c 2012-12-15 11:53:34.000000000 +0100 +@@ -143,7 +143,7 @@ + strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r)); + strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r)); + +- int timerMatch; ++ eTimerMatch timerMatch; + bool hasTimer = false; + if (Timers.GetMatch(pEvent, &timerMatch)) + hasTimer = (timerMatch == tmFull); diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff new file mode 100644 index 000000000000..5b9d657e95ec --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-2.1.2.diff @@ -0,0 +1,15 @@ +diff -Naur epgsearch-1.0.0.orig/uservars.h epgsearch-1.0.0/uservars.h +--- epgsearch-1.0.0.orig/uservars.h 2013-10-23 00:54:29.000000000 +0200 ++++ epgsearch-1.0.0/uservars.h 2013-10-23 00:56:21.000000000 +0200 +@@ -537,7 +537,11 @@ + cVideodirVar() : cInternalVar("%videodir%") {} + string Evaluate(const cEvent*, bool escapeStrings = false) + { ++#if APIVERSNUM > 20101 ++ return cVideoDirectory::Name(); ++#else + return VideoDirectory; ++#endif + } + }; + diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff new file mode 100644 index 000000000000..25e27e958a4a --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff @@ -0,0 +1,25 @@ +diff -Naur vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile +--- vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile 2015-02-21 21:01:08.926052710 +0100 ++++ vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile 2015-02-21 21:03:42.768052710 +0100 +@@ -255,9 +255,9 @@ + docs: + ./docsrc2man.sh + ./docsrc2html.sh +- ln -sf ./doc/en/epgsearch.4.txt MANUAL +- ln -sf ./doc/en/epgsearch.1.txt README +- ln -sf ./doc/de/epgsearch.1.txt README.DE ++# ln -sf ./doc/en/epgsearch.4.txt MANUAL ++# ln -sf ./doc/en/epgsearch.1.txt README ++# ln -sf ./doc/de/epgsearch.1.txt README.DE + + install-$(PLUGIN): libvdr-$(PLUGIN).so + install -D libvdr-$(PLUGIN).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) +@@ -272,7 +272,7 @@ + install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION) + + install-conf: +- mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) + cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) + + install-doc: |