9 files changed, 29 insertions, 61 deletions

diff --git a/multimedia/vdr/files/patch-channels.c b/multimedia/vdr/files/patch-channels.c
deleted file mode 100644
index b98a445c37b5..000000000000
--- a/multimedia/vdr/files/patch-channels.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN vdr-1.7.27-orig/channels.c vdr-1.7.27/channels.c
---- channels.c
-+++ channels.c
-@@ -955,7 +955,7 @@ int cChannels::MaxShortChannelNameLength
-   if (!maxShortChannelNameLength) {
-      for (cChannel *channel = First(); channel; channel = Next(channel)) {
-          if (!channel->GroupSep())
--            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength);
-+            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength);
-          }
-      }
-   return maxShortChannelNameLength;
diff --git a/multimedia/vdr/files/patch-eitscan.c b/multimedia/vdr/files/patch-eitscan.c
deleted file mode 100644
index af276b6a2f14..000000000000
--- a/multimedia/vdr/files/patch-eitscan.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- eitscan.c.orig
-+++ eitscan.c
-@@ -148,7 +148,7 @@ void cEITScanner::Process(void)
-                       if (Channel) {
-                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
-                             if (Device->ProvidesTransponder(Channel)) {
--                               if (!Device->Receiving()) {
-+                               if (Device->Priority() < 0) {
-                                   bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel);
-                                   if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
-                                      if (!MaySwitchTransponder) {
diff --git a/multimedia/vdr/files/patch-font.c b/multimedia/vdr/files/patch-font.c
deleted file mode 100644
index 15f960e05777..000000000000
--- a/multimedia/vdr/files/patch-font.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- font.c.orig
-+++ font.c
-@@ -486,7 +486,8 @@ cString cFont::GetFontFileName(const cha
-      FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
-      FcConfigSubstitute(NULL, pat, FcMatchPattern);
-      FcDefaultSubstitute(pat);
--     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
-+     FcResult fresult;
-+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
-      if (fontset) {
-         for (int i = 0; i < fontset->nfont; i++) {
-             FcBool scalable;
diff --git a/multimedia/vdr/files/patch-oldgcc b/multimedia/vdr/files/patch-oldgcc
new file mode 100644
index 000000000000..b393001b89c0
--- /dev/null
+++ b/multimedia/vdr/files/patch-oldgcc
@@ -0,0 +1,11 @@
+--- timers.c.orig
++++ timers.c
+@@ -843,7 +843,7 @@ static int CompareTimers(const void *a, 
+ }
+ 
+ cSortedTimers::cSortedTimers(void)
+-:cVector(Timers.Count())
++:cVector<const cTimer *>(Timers.Count())
+ {
+   for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
+       Append(Timer);
diff --git a/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER b/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER
deleted file mode 100644
index 2d12071a5593..000000000000
--- a/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER
+++ /dev/null
@@ -1,11 +0,0 @@
---- receiver.h.orig
-+++ receiver.h
-@@ -14,7 +14,7 @@
- 
- #define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
- 
--//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
-+#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
- 
- class cReceiver {
-   friend class cDevice;
diff --git a/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS b/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
deleted file mode 100644
index 7f029ed6febe..000000000000
--- a/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
+++ /dev/null
@@ -1,11 +0,0 @@
---- recording.h.orig
-+++ recording.h
-@@ -22,7 +22,7 @@
- #define TIMERMACRO_TITLE    "TITLE"
- #define TIMERMACRO_EPISODE  "EPISODE"
- 
--//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
-+#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
- 
- extern bool VfatFileSystem;
- extern int InstanceId;
diff --git a/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff b/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff
new file mode 100644
index 000000000000..4261a9b9f81b
--- /dev/null
+++ b/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff
@@ -0,0 +1,11 @@
+--- device.c	2012/06/09 14:37:24	2.61
++++ device.c	2012/06/10 13:13:18
+@@ -334,7 +334,7 @@
+          if (d->ProvidesTransponder(Channel)) {
+             if (d->MaySwitchTransponder(Channel))
+                Device = d; // this device may switch to the transponder without disturbing any receiver or live view
+-            else if (!d->Occupied()) {
++            else if (!d->Occupied() && d->MaySwitchTransponder(Channel)) { // MaySwitchTransponder() implicitly calls Occupied()
+                if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority()))
+                   Device = d; // use this one only if no other with less impact can be found
+                }
diff --git a/multimedia/vdr/files/patch-vdr-1.7.27_FreeBSD b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD
index b20b6df54cdc..e10e0922cb4c 100644
--- a/multimedia/vdr/files/patch-vdr-1.7.27_FreeBSD
+++ b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD
@@ -852,7 +852,7 @@ Index: tools.h
  typedef unsigned char uchar;
  
  extern int SysLogLevel;
-@@ -227,9 +233,17 @@ bool SpinUpDisk(const char *FileName);
+@@ -227,12 +233,20 @@ bool SpinUpDisk(const char *FileName);
  void TouchFile(const char *FileName);
  time_t LastModifiedTime(const char *FileName);
  off_t FileSize(const char *FileName); ///< returns the size of the given file, or -1 in case of an error (e.g. if the file doesn't exist)
@@ -861,15 +861,18 @@ Index: tools.h
 +#else
  cString WeekDayName(int WeekDay);
 +#endif
+     ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a three letter
+     ///< day name.
  cString WeekDayName(time_t t);
+     ///< Converts the week day of the given time to a three letter day name.
 +#ifdef __FreeBSD__
 +cString WeekDayNameFullReal(int WeekDay);
 +#else
  cString WeekDayNameFull(int WeekDay);
 +#endif
+     ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a full
+     ///< day name.
  cString WeekDayNameFull(time_t t);
- cString DayDateTime(time_t t = 0);
- cString TimeToString(time_t t);
 Index: vdr.c
 --- vdr.c
 +++ vdr.c
diff --git a/multimedia/vdr/files/remote.conf b/multimedia/vdr/files/remote.conf
index cc797a701f51..d6898e16a2d3 100644
--- a/multimedia/vdr/files/remote.conf
+++ b/multimedia/vdr/files/remote.conf
@@ -35,7 +35,7 @@ XKeySym.Info       i
 XKeySym.Mute       m
 XKeySym.Play       p
 XKeySym.Play       y
-XKeySym.Pause      Space
+XKeySym.Pause      space
 XKeySym.Stop       s
 XKeySym.Record     r
 XKeySym.FastFwd    w