From 9689856e119afe4eeae96ef36600946180d5379c Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 01/17] minisatip: update to 0.7.18

---
 packages/addons/service/minisatip/changelog.txt |  3 +++
 packages/addons/service/minisatip/package.mk    | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/addons/service/minisatip/changelog.txt b/packages/addons/service/minisatip/changelog.txt
index ed5784c55b..b1abb4dbac 100644
--- a/packages/addons/service/minisatip/changelog.txt
+++ b/packages/addons/service/minisatip/changelog.txt
@@ -1,2 +1,5 @@
+101
+- update to 0.7.18
+
 100
 - Initial Release
diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk
index fe298a9d2f..063f5082a9 100644
--- a/packages/addons/service/minisatip/package.mk
+++ b/packages/addons/service/minisatip/package.mk
@@ -2,15 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minisatip"
-PKG_VERSION="110e6e99bc6c823b2a2c30ea02c58c91f59d077e"
-PKG_SHA256="8ac997ae70d80bc50603609baf9a86253cf525f179c71fada5320301abaea902"
-PKG_VERSION_NUMBER="0.7.16"
-PKG_REV="100"
+PKG_VERSION="a3af6dd93c4fd9dbbb62073f3642a289826d84bb"
+PKG_SHA256="32d17edab044f9fdba9e39bb4a8332aa087951695c1629d81687ff957c8d601d"
+PKG_VERSION_NUMBER="0.7.18"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/catalinii/minisatip"
 PKG_URL="https://github.com/catalinii/minisatip/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain dvb-apps libdvbcsa libxml2"
+PKG_DEPENDS_TARGET="toolchain dvb-apps libdvbcsa libxml2 openssl"
 PKG_SECTION="service"
 PKG_SHORTDESC="minisatip: a Sat>IP streaming server for Linux"
 PKG_LONGDESC="minisatip($PKG_VERSION_NUMBER): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T"
@@ -31,8 +31,8 @@ pre_configure_target() {
     rm -rf .$TARGET_NAME
 
   # enables Common Interface (DVBEN50221)
-  CFLAGS="$CFLAGS -I$(get_build_dir dvb-apps)/lib"
-  LDFLAGS="$LDFLAGS -L$(get_build_dir dvb-apps)/lib/libdvbapi -L$(get_build_dir dvb-apps)/lib/libdvben50221 -L$(get_build_dir dvb-apps)/lib/libucsi"
+  CFLAGS+=" -I$(get_build_dir dvb-apps)/lib"
+  LDFLAGS+=" -L$(get_build_dir dvb-apps)/lib/libdvbapi -L$(get_build_dir dvb-apps)/lib/libdvben50221 -L$(get_build_dir dvb-apps)/lib/libucsi"
 }
 
 makeinstall_target() {

From 2307fc6682ed53c995b1c879c90bec4a7843c077 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 02/17] vdr: update to 2.4.1

---
 packages/addons/addon-depends/vdr/package.mk  |  6 +-
 ...0-upstream-fix-01-svdrp-modt-recflag.patch | 46 ----------
 ...ream-fix-02-invalid-locking-sequence.patch | 48 ----------
 ...tream-fix-03-locking-channel-display.patch | 89 -------------------
 ...eam-fix-04-locking-channel-display-2.patch | 18 ----
 .../vdr-10-upstream-fix-05-shutdown.patch     | 33 -------
 ...dr-10-upstream-fix-06-channel-switch.patch | 31 -------
 ...vdr-10-upstream-fix-07-disabling-mtd.patch | 13 ---
 8 files changed, 3 insertions(+), 281 deletions(-)
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-01-svdrp-modt-recflag.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-02-invalid-locking-sequence.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-03-locking-channel-display.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-04-locking-channel-display-2.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-05-shutdown.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-06-channel-switch.patch
 delete mode 100644 packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-07-disabling-mtd.patch

diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk
index 1d1029c8f2..ba1849775f 100644
--- a/packages/addons/addon-depends/vdr/package.mk
+++ b/packages/addons/addon-depends/vdr/package.mk
@@ -4,11 +4,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr"
-PKG_VERSION="2.4.0"
-PKG_SHA256="93af49fe87048073dc38ef5e6c71e9704344d730f21c261afac69e3c937f8cce"
+PKG_VERSION="2.4.1"
+PKG_SHA256="25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="ftp://ftp.tvdr.de/vdr/vdr-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.tvdr.de/vdr-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain bzip2 fontconfig freetype libcap libiconv libjpeg-turbo"
 PKG_LONGDESC="A DVB TV server application."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-01-svdrp-modt-recflag.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-01-svdrp-modt-recflag.patch
deleted file mode 100644
index 999fe2b264..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-01-svdrp-modt-recflag.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/
-
-# This patch fixes a bug in handling the tfRecording flag in the SVDRP commands MODT
-# and UPDT. The tfRecording flag must only be handled by the VDR that actually hosts
-# and processes the timer.
-#
---- a/svdrp.c	2018/03/19 12:16:33	5.0
-+++ b/svdrp.c	2018/04/19 09:45:08
-@@ -2036,6 +2036,7 @@
-         LOCK_TIMERS_WRITE;
-         Timers->SetExplicitModify();
-         if (cTimer *Timer = Timers->GetById(Id)) {
-+           bool IsRecording = Timer->HasFlags(tfRecording);
-            cTimer t = *Timer;
-            if (strcasecmp(tail, "ON") == 0)
-               t.SetFlags(tfActive);
-@@ -2046,6 +2047,10 @@
-               return;
-               }
-            *Timer = t;
-+           if (IsRecording)
-+              Timer->SetFlags(tfRecording);
-+           else
-+              Timer->ClrFlags(tfRecording);
-            Timers->SetModified();
-            isyslog("SVDRP %s < %s modified timer %s (%s)", Setup.SVDRPHostName, *clientName, *Timer->ToDescr(), Timer->HasFlags(tfActive) ? "active" : "inactive");
-            Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
-@@ -2478,12 +2483,18 @@
-      if (Timer->Parse(Option)) {
-         LOCK_TIMERS_WRITE;
-         if (cTimer *t = Timers->GetTimer(Timer)) {
-+           bool IsRecording = t->HasFlags(tfRecording);
-            t->Parse(Option);
-            delete Timer;
-            Timer = t;
-+           if (IsRecording)
-+              Timer->SetFlags(tfRecording);
-+           else
-+              Timer->ClrFlags(tfRecording);
-            isyslog("SVDRP %s < %s updated timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
-            }
-         else {
-+           Timer->ClrFlags(tfRecording);
-            Timers->Add(Timer);
-            isyslog("SVDRP %s < %s added timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
-            }
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-02-invalid-locking-sequence.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-02-invalid-locking-sequence.patch
deleted file mode 100644
index 00db568013..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-02-invalid-locking-sequence.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# This patch fixes a possible invalid locking sequence in case a remote timer handling error message
-# is displayed on the OSD and the skin tries to lock the Recordings or DeletedRecordings
-# list in its Flush() function (for instance by calling cVideoDiskUsage::HasChanged()).
-# To do this, the call to Skins.Message() in menu.c's HandleRemoteModifications() has
-# been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called
-# unconditionally in the main loop, and checks whether the current cSkinDisplay object
-# (if any) implements SetMessage().
-#
---- 1/menu.c	2018/04/14 10:24:41	5.0
-+++ 1/menu.c	2018/04/28 12:09:45
-@@ -1075,7 +1075,7 @@
- {
-   cString ErrorMessage;
-   if (!HandleRemoteTimerModifications(NewTimer, OldTimer, &ErrorMessage)) {
--     Skins.Message(mtError, ErrorMessage);
-+     Skins.QueueMessage(mtError, ErrorMessage);
-      return false;
-      }
-   return true;
---- 1/skins.c	2013/08/18 12:07:22	5.0
-+++ 1/skins.c	2018/04/28 12:13:01
-@@ -352,6 +352,14 @@
-      dsyslog("cSkins::ProcessQueuedMessages() called from background thread - ignored!");
-      return;
-      }
-+  // Check whether there is a cSkinDisplay object (if any) that implements SetMessage():
-+  if (cSkinDisplay *sd = cSkinDisplay::Current()) {
-+     if (!(dynamic_cast<cSkinDisplayChannel *>(sd) ||
-+           dynamic_cast<cSkinDisplayMenu *>(sd) ||
-+           dynamic_cast<cSkinDisplayReplay *>(sd) ||
-+           dynamic_cast<cSkinDisplayMessage *>(sd)))
-+        return;
-+     }
-   cSkinQueuedMessage *msg = NULL;
-   // Get the first waiting message:
-   queueMessageMutex.Lock();
---- 1/vdr.c	2018/04/10 13:24:43	5.0
-+++ 1/vdr.c	2018/04/28 11:27:48
-@@ -1176,8 +1176,7 @@
-         if (!Menu && !cOsd::IsOpen())
-            Menu = CamControl();
-         // Queued messages:
--        if (!Skins.IsOpen())
--           Skins.ProcessQueuedMessages();
-+        Skins.ProcessQueuedMessages();
-         // User Input:
-         cOsdObject *Interact = Menu ? Menu : cControl::Control();
-         eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-03-locking-channel-display.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-03-locking-channel-display.patch
deleted file mode 100644
index b2c1c710bf..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-03-locking-channel-display.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# Fixed locking the Channels list in cDisplayChannel, where the lock was still held
-# when Flush() was called.
-#
---- 1/menu.c	2018/04/28 12:09:45	5.1
-+++ 1/menu.c	2018/05/06 09:30:11
-@@ -4626,14 +4626,17 @@
-   cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
-   positioner = NULL;
-   channel = NULL;
--  LOCK_CHANNELS_READ;
--  channel = Channels->GetByNumber(Number);
--  lastPresent = lastFollowing = NULL;
--  if (channel) {
--     DisplayChannel();
--     DisplayInfo();
-+  {
-+    LOCK_CHANNELS_READ;
-+    channel = Channels->GetByNumber(Number);
-+    lastPresent = lastFollowing = NULL;
-+    if (channel) {
-+       DisplayChannel();
-+       DisplayInfo();
-+       }
-+  }
-+  if (channel)
-      displayChannel->Flush();
--     }
-   lastTime.Set();
- }
- 
-@@ -4868,31 +4871,33 @@
-             }
-     };
-   if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
--     LOCK_CHANNELS_READ;
--     if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
--        // makes sure a channel switch through the SVDRP CHAN command is displayed
--        channel = Channels->GetByNumber(cDevice::CurrentChannel());
--        Refresh();
--        lastTime.Set();
--        }
--     DisplayInfo();
--     if (NewChannel) {
--        SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
--        Channels->SwitchTo(NewChannel->Number());
--        SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
--        channel = NewChannel;
--        }
--     const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
--     bool PositionerMoving = Positioner && Positioner->IsMoving();
--     SetNeedsFastResponse(PositionerMoving);
--     if (!PositionerMoving) {
--        if (positioner)
--           lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
--        Positioner = NULL;
--        }
--     if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
--        displayChannel->SetPositioner(Positioner);
--     positioner = Positioner;
-+     {
-+       LOCK_CHANNELS_READ;
-+       if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
-+          // makes sure a channel switch through the SVDRP CHAN command is displayed
-+          channel = Channels->GetByNumber(cDevice::CurrentChannel());
-+          Refresh();
-+          lastTime.Set();
-+          }
-+       DisplayInfo();
-+       if (NewChannel) {
-+          SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
-+          Channels->SwitchTo(NewChannel->Number());
-+          SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
-+          channel = NewChannel;
-+          }
-+       const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
-+       bool PositionerMoving = Positioner && Positioner->IsMoving();
-+       SetNeedsFastResponse(PositionerMoving);
-+       if (!PositionerMoving) {
-+          if (positioner)
-+             lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
-+          Positioner = NULL;
-+          }
-+       if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
-+          displayChannel->SetPositioner(Positioner);
-+       positioner = Positioner;
-+     }
-      displayChannel->Flush();
-      return osContinue;
-      }
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-04-locking-channel-display-2.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-04-locking-channel-display-2.patch
deleted file mode 100644
index 3311e664a3..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-04-locking-channel-display-2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixed locking the Channels list in cDisplayChannel, where the lock was still held
-# when Flush() was called (cont'd).
-#
---- 1/menu.c	2018/05/06 09:30:11	5.2
-+++ 1/menu.c	2018/05/27 09:51:56	5.3
-@@ -4654,8 +4654,10 @@
-   displayChannel = Skins.Current()->DisplayChannel(withInfo);
-   positioner = NULL;
-   channel = NULL;
--  LOCK_CHANNELS_READ;
--  channel = Channels->GetByNumber(cDevice::CurrentChannel());
-+  {
-+    LOCK_CHANNELS_READ;
-+    channel = Channels->GetByNumber(cDevice::CurrentChannel());
-+  }
-   ProcessKey(FirstKey);
- }
- 
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-05-shutdown.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-05-shutdown.patch
deleted file mode 100644
index 746ec34fb2..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-05-shutdown.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Fixed shutdown after user inactivity in case a plugin is keeping the OSD open.
-#
---- a/vdr.c	2018/04/28 11:27:48	5.1
-+++ b/vdr.c	2018/07/16 08:52:40	5.2
-@@ -1514,9 +1514,7 @@
-               ShutdownHandler.countdown.Cancel();
-            }
- 
--        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
--           // Handle housekeeping tasks
--
-+        if (!cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
-            // Shutdown:
-            // Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
-            time_t Soon = Now + SHUTDOWNWAIT;
-@@ -1535,7 +1533,8 @@
-               // Do this again a bit later:
-               ShutdownHandler.SetRetry(SHUTDOWNRETRY);
-               }
--
-+           // Handle housekeeping tasks
-+           if ((Now - LastInteract) > ACTIVITYTIMEOUT) {
-            // Disk housekeeping:
-            RemoveDeletedRecordings();
-            ListGarbageCollector.Purge();
-@@ -1543,6 +1542,7 @@
-            // Plugins housekeeping:
-            PluginManager.Housekeeping();
-            }
-+           }
- 
-         ReportEpgBugFixStats();
- 
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-06-channel-switch.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-06-channel-switch.patch
deleted file mode 100644
index 9a8662b10c..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-06-channel-switch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Fixed switching through encrypted channels with the Up/Down keys
-#
---- a/device.c	2018/03/24 09:49:14	5.0
-+++ b/device.c	2018/07/16 09:29:57
-@@ -787,6 +787,7 @@
-   if (LiveView) {
-      isyslog("switching to channel %d %s (%s)", Channel->Number(), *Channel->GetChannelID().ToString(), Channel->Name());
-      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
-      }
-   for (int i = 3; i--;) {
-       switch (SetChannel(Channel, LiveView)) {
-@@ -809,6 +810,7 @@
-   Direction = sgn(Direction);
-   if (Direction) {
-      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
-      int n = CurrentChannel() + Direction;
-      int first = n;
-      LOCK_CHANNELS_READ;
---- a/menu.c	2018/05/27 09:51:56	5.3
-+++ b/menu.c	2018/07/16 09:29:57
-@@ -4704,6 +4704,8 @@
- const cChannel *cDisplayChannel::NextAvailableChannel(const cChannel *Channel, int Direction)
- {
-   if (Direction) {
-+     cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
-      LOCK_CHANNELS_READ;
-      while (Channel) {
-            Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel);
diff --git a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-07-disabling-mtd.patch b/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-07-disabling-mtd.patch
deleted file mode 100644
index 4e97a6c598..0000000000
--- a/packages/addons/addon-depends/vdr/patches/vdr-10-upstream-fix-07-disabling-mtd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Now deactivating MTD support if a non MCD capable CAM is inserted after removing
-# a previously used CAM that is MCD capable.
-#
---- a/ci.c	2018/03/19 16:37:03	5.0
-+++ b/ci.c	2018/09/23 10:17:20
-@@ -1213,6 +1213,7 @@
-         }
-      else {
-         dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
-+        CamSlot()->MtdActivate(false);
-         state = 4; // normal operation
-         }
-      }

From 32fb0dbdb63843aea2f6685aa849ed811db4a94d Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 03/17] vdr-plugin-satip: update to b697e43

---
 .../addon-depends/vdr-plugins/vdr-plugin-satip/package.mk     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
index fb39580e7c..f9e90d7a84 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-satip"
-PKG_VERSION="a4051bf88c1f3c86cfe5133fd703517296f7f590"
-PKG_SHA256="ea9f930b829e4c333f8401e64b5e03a82efb88a4c6db3320463b295d297b0035"
+PKG_VERSION="b697e435d4bf42754309e6b5a9c5f8ff43463077"
+PKG_SHA256="9ccb90b4b55848bad738236e07e0feb2af9e78e6c9ee6614b5a1172db3e00fb0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
 PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/$PKG_VERSION.tar.gz"

From ba7682954f666e89f47a6185a6195d23e4143bab Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 04/17] vdr-plugin-robotv: update to 13b691a

---
 .../addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
index a460e2e09b..58ee6f56b8 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-robotv"
-PKG_VERSION="50d4bdcdbe3bdb6e85fe02de4c4086ca1f8db94d"
-PKG_SHA256="062489e55111f0ba2420463cc506865ac59b1c1d080b318cb81d58ec3f4fbd3f"
+PKG_VERSION="13b691af63743ce6481e2558dc50ee89dd7a0349"
+PKG_SHA256="1bd508383d3b393dd1273af9bef07a1a64ac22c8eada85c96e5aa541c3abf228"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/pipelka/roboTV"
 PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/$PKG_VERSION.tar.gz"

From f4ba1c8d0a4acaaf66ed59690f3b3c398fc1f756 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 05/17] vdr-plugin-epgsearch: update to 770de32

---
 .../addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
index 9feb102564..82ac3e881e 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-epgsearch"
-PKG_VERSION="84b59b81137887a48533cc897551bccf2e9e10f6"
-PKG_SHA256="d6c4a9136588a7cdf2eb43b6b9643a5bb81a44c542c6e6fcf7448b2383901914"
+PKG_VERSION="770de32f1908b1f9c60f66bf288a4c8a03f97d52"
+PKG_SHA256="8b6144ee3d22b0c13ba81be94920b421b05fd9b921dfe8245ed582db407acac8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
 PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/$PKG_VERSION.tar.gz"

From be4588cba890830cba7b30b69bab16edd94bead6 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 06/17] vdr-addon: don't stop vdr before kodi

---
 .../source/system.d/service.multimedia.vdr-addon.service         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service b/packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service
index f9d1159ded..94f9b137dc 100644
--- a/packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service
+++ b/packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=vdr
 After=graphical.target
+Before=kodi.service
 
 [Service]
 ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.vdr-addon/bin/vdr.start"

From 10b73fa523df0efcab918f4f6c8649b16336e0f8 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 07/17] vdr-addon: update to 2.4.1

---
 packages/addons/service/vdr-addon/changelog.txt | 8 +++++++-
 packages/addons/service/vdr-addon/package.mk    | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/vdr-addon/changelog.txt b/packages/addons/service/vdr-addon/changelog.txt
index 525be4d6a5..47dede61a1 100644
--- a/packages/addons/service/vdr-addon/changelog.txt
+++ b/packages/addons/service/vdr-addon/changelog.txt
@@ -1,3 +1,9 @@
+111
+- update VDR to 2.4.1
+- update epgsearch to 2019-04-11
+- update robotv to 2019-06-19
+- update satip to 2019-02-08
+
 110
 - fix deprecated VDR_CHARSET_OVERRIDE
 
@@ -9,7 +15,7 @@
 - update Sat>IP plugin to a4051bf
 - update VNSI plugin to 1.8.0
 - update VDR 2.4.0 upstream patches
-- update Wirbelscan plugin to 2018.11.04
+- update Wirbelscan plugin to 2018-11-04
 
 108
 - update VDR to 2.4.0
diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index 70e3cb3a61..d3d9847fef 100644
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -4,8 +4,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="2.4"
-PKG_REV="110"
+PKG_VERSION="2.4.1"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

From 49665d0f56a072c0babf242cb25d8728213fee29 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 08/17] libvpx: update to 1.8.0

---
 .../addons/addon-depends/ffmpegx-depends/libvpx/package.mk    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
index 4e388a9ba7..f11d988262 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.7.0"
-PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238"
+PKG_VERSION="1.8.0"
+PKG_SHA256="86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"

From 692820c7e60894f60a2e8159ab8ab08f8affd86c Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 09/17] x264: update to d4099dd

---
 packages/addons/addon-depends/ffmpegx-depends/x264/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
index 4bd2b06eb1..0b0cbd9359 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="545de2ffec6ae9a80738de1b2c8cf820249a2530"
-PKG_SHA256="74725cf7036b2c96387c2c014ef00d181942d00230f21e16277f11d2d9683adc"
+PKG_VERSION="d4099dd4c722f52c4f3c14575d7d39eb8fadb97f"
+PKG_SHA256="9b6688b81e13cf342fc9b6b7adf1759eebd300c243c0707566ffe7ea9f0ccc7e"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
 PKG_URL="http://repo.or.cz/x264.git/snapshot/$PKG_VERSION.tar.gz"

From fb481d6e8badd1a581aee488629c64a71afe3069 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 10/17] x265: update to 3.0

---
 packages/addons/addon-depends/ffmpegx-depends/x265/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
index 2943c2effe..765c44602c 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x265"
-PKG_VERSION="2.9"
-PKG_SHA256="ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024"
+PKG_VERSION="3.0"
+PKG_SHA256="c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/developers/x265.html"

From 51952298dfe6408a8ca07cd1792910fdc1e7eebf Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 11/17] comskip: update to 14dffb2

---
 packages/addons/addon-depends/comskip/package.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk
index 4d445ace0b..a4dcc86f33 100644
--- a/packages/addons/addon-depends/comskip/package.mk
+++ b/packages/addons/addon-depends/comskip/package.mk
@@ -2,17 +2,17 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="comskip"
-PKG_VERSION="6030aa0d3b589161ec96c6c986c48aa826fb9f72"
-PKG_SHA256="df0b4b0354aef5acc17e4e94a20a396fa69c474af7579c94aad09dd490e0ee38"
+PKG_VERSION="14dffb241fac0126e261d4ff5bf929479e2592b6"
+PKG_SHA256="025bfd532aa6ccfd513f4d88f34ec95a9b5a34c763ed13c17433b36415e5bfd4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kaashoek.com/comskip/"
 PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain argtable2 ffmpeg"
+PKG_DEPENDS_TARGET="toolchain argtable2 ffmpeg gnutls"
 PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."
 PKG_TOOLCHAIN="autotools"
 
 pre_configure_target() {
-  LDFLAGS="$LDFLAGS -ldl"
+  LDFLAGS+=" -ldl"
 
   export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
   export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"

From 11c50fa04967618872b0b25d8eaa07e8777cded5 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 12/17] ffmpegx: x86_64 depends on vaapi

---
 packages/addons/addon-depends/ffmpegx/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk
index f9bf91a49c..19eb18a484 100644
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -19,7 +19,7 @@ if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
 fi
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET+=" nasm:host x265"
+  PKG_DEPENDS_TARGET+=" nasm:host intel-vaapi-driver x265"
 fi
 
 if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then

From 5052df509881a5410bfcfc37e6523db64c0476da Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 13/17] aom: update to add63ad

---
 packages/multimedia/aom/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk
index 3ed3eef502..3e42944a4c 100644
--- a/packages/multimedia/aom/package.mk
+++ b/packages/multimedia/aom/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aom"
-PKG_VERSION="06e2c4fa33edb7f27702fbe2ad2311622da956b4"
-PKG_SHA256="9c4d7943de97af0153a38151f40c7a926f331d4a3b7dceea4e179173ce51c654"
+PKG_VERSION="add63ad6740a9882d2760abc68a03cd7ee836c7e"
+PKG_SHA256="f45996e2ed4d689c5ea84d449cd702981690afecd4bc641e09e96f8883bddd2d"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="http://repo.or.cz/aom.git/snapshot/${PKG_VERSION}.tar.gz"

From ea070a425249ec2a99ea41a774943681de681b39 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 14/17] aom: update to e2c1d5e

---
 packages/multimedia/aom/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk
index 3e42944a4c..170ce8e224 100644
--- a/packages/multimedia/aom/package.mk
+++ b/packages/multimedia/aom/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aom"
-PKG_VERSION="add63ad6740a9882d2760abc68a03cd7ee836c7e"
-PKG_SHA256="f45996e2ed4d689c5ea84d449cd702981690afecd4bc641e09e96f8883bddd2d"
+PKG_VERSION="e2c1d5ef82e86db553ae8112fc68c6cefee1f8d0"
+PKG_SHA256="b85673d5436f134f74c966f493f3b4d299215332f0e1d56c137e50eda9d6a245"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="http://repo.or.cz/aom.git/snapshot/${PKG_VERSION}.tar.gz"

From d9f5c1f594ec9a7898c9e7ef0419c78653e9638f Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 15/17] libhdhomerun: update to 20190625

---
 .../tvheadend42-03-hdhomerun-fix.patch        | 27 +++++++++++++++++++
 packages/multimedia/libhdhomerun/package.mk   |  6 ++---
 ...ibhdhomerun-pr19-fix-gcc-8.3.0-build.patch | 24 -----------------
 3 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch
 delete mode 100644 packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch

diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch
new file mode 100644
index 0000000000..418e8ca1dc
--- /dev/null
+++ b/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch
@@ -0,0 +1,27 @@
+https://github.com/tvheadend/tvheadend/commit/13cd23c371e3377973502f8dc65654b6a0ff372b
+
+From: Michael Marley <michael@michaelmarley.com>
+Date: Wed, 26 Jun 2019 19:35:50 -0400
+Subject: [PATCH] Fix compilation with libhdhomerun 20190621
+
+They renamed the symbol that was used to determine whether the
+"hdhomerun_discover_find_devices_custom" needed to be aliased,
+causing an FTBFS.  Instead, recognize both the old and new symbols.
+---
+ src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+index 58dec51ab3..18068faf5d 100644
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+@@ -32,7 +32,8 @@
+ 
+ #include "config.h"
+ 
+-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \
++           || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
+ #define hdhomerun_discover_find_devices_custom \
+            hdhomerun_discover_find_devices_custom_v2
+ #endif
diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/multimedia/libhdhomerun/package.mk
index 4dea9bc3d6..6c0cf26557 100644
--- a/packages/multimedia/libhdhomerun/package.mk
+++ b/packages/multimedia/libhdhomerun/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libhdhomerun"
-PKG_VERSION="20180817"
-PKG_SHA256="437888b27206f526827ee7a4c57c1c167a36483b0445232e07fb7bb7ee854b42"
+PKG_VERSION="b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6" #20190625
+PKG_SHA256="ac39e03090c148678e1a8d4f928a728caccd2d29a0555287e7e5ece28c876959"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.silicondust.com"
-PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz"
+PKG_URL="https://github.com/Silicondust/libhdhomerun/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The library provides functionality to setup the HDHomeRun."
 
diff --git a/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch b/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch
deleted file mode 100644
index 71065d14fe..0000000000
--- a/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a83ec0c045d3fadb78a879d0ac8ae999b89786df Mon Sep 17 00:00:00 2001
-From: fuzzard <bmurphy@bcmcs.net>
-Date: Sun, 24 Feb 2019 07:47:31 +1000
-Subject: [PATCH] alignas c++ fix
-
-alignas is a keyword in c++. Dont define.
-Change is in windows header already, and GCC 8.3.0 is erroring on this now.
----
- hdhomerun_os_posix.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hdhomerun_os_posix.h b/hdhomerun_os_posix.h
-index baab8e5..d3dc5cb 100644
---- a/hdhomerun_os_posix.h
-+++ b/hdhomerun_os_posix.h
-@@ -53,7 +53,7 @@ typedef struct {
- 
- #define LIBHDHOMERUN_API
- 
--#if !defined(alignas)
-+#if !defined(alignas) && !defined(__cplusplus)
- #define alignas(n) __attribute__((aligned(n)))
- #endif
- 

From 9be01dd43b5423208e21e685954669b4bbbb0988 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 16/17] ffmpeg-tools: update to 108

---
 packages/addons/tools/ffmpeg-tools/changelog.txt | 14 ++++++++++----
 packages/addons/tools/ffmpeg-tools/package.mk    |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/addons/tools/ffmpeg-tools/changelog.txt b/packages/addons/tools/ffmpeg-tools/changelog.txt
index a54f371b96..d22f80db47 100644
--- a/packages/addons/tools/ffmpeg-tools/changelog.txt
+++ b/packages/addons/tools/ffmpeg-tools/changelog.txt
@@ -1,3 +1,9 @@
+107
+- Update aom to 2019-03-05
+- Update FFmpeg to 4.1.3
+- Update x264 to 2019-03-06
+- Update x265 to 3.0
+
 106
 - Use system libidn2
 
@@ -10,19 +16,19 @@
 - Update aom to d2a592e
 - Update FFmpeg to 4.1
 - Update opus to 1.3
-- Update x264 to 20181116
+- Update x264 to 2018-11-16
 - Update x265 to 2.9
 
 103
-- Update AV1 to 20181002
+- Update AV1 to 2018-10-02
 - Update FFmpeg to 4.0.2
-- Update X264 to 20181001
+- Update X264 to 2018-10-01
 
 102
 - Rename binary to ffmpeg (no ffmpegx anymore)
 - Update AV1 to 96ee0eb
 - Update FFmpeg to 4.0.1
-- Update X264 to 20180627
+- Update X264 to 2018-06-27
 - Update X265 to 2.8
 
 101
diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk
index 9a08a1c203..e10acc1c61 100644
--- a/packages/addons/tools/ffmpeg-tools/package.mk
+++ b/packages/addons/tools/ffmpeg-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="ffmpeg-tools"
 PKG_VERSION="1.0"
-PKG_REV="106"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

From f07b611b850f44b719f1bb23bd0faaaff2515925 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Fri, 2 Aug 2019 22:45:18 +0200
Subject: [PATCH 17/17] tvheadend42: update to 4.2.8-27

---
 .../addons/service/tvheadend42/changelog.txt     |  4 ++++
 packages/addons/service/tvheadend42/package.mk   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
index 907458ec73..2c619b263d 100644
--- a/packages/addons/service/tvheadend42/changelog.txt
+++ b/packages/addons/service/tvheadend42/changelog.txt
@@ -1,3 +1,7 @@
+120
+- update to 4.2.8-27
+- update comskip to 2019-03-30
+
 119
 - Use system libidn2
 
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 6b9524798d..d24d93c899 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="5c218500579d5bd1c1f7e7a4b5f7f0fb35baa626"
-PKG_SHA256="a9fe5a4c36aa185e3f0a73a709f0dc05794ae9c12f5d888985b559ff68a2508d"
-PKG_VERSION_NUMBER="4.2.7-44"
-PKG_REV="119"
+PKG_VERSION="5c1b37b50e99f9bf91d38f08f7bd358ee270660f"
+PKG_SHA256="cfce42a6534eec1728b4e84906f845d4805618e584624d1777d038f9377eed98"
+PKG_VERSION_NUMBER="4.2.8-27"
+PKG_REV="120"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
@@ -83,17 +83,17 @@ pre_configure_target() {
 
 # pass ffmpegx to build
   PKG_CONFIG_PATH="$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib/pkgconfig"
-  CFLAGS="$CFLAGS -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include"
-  LDFLAGS="$LDFLAGS -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib"
+  CFLAGS+=" -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include"
+  LDFLAGS+=" -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib"
 
 # pass gnutls to build
   LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
 
 # pass libhdhomerun to build
-  CFLAGS="$CFLAGS -I$(get_build_dir libhdhomerun)"
+  CFLAGS+=" -I$(get_build_dir libhdhomerun)"
 
   export CROSS_COMPILE="$TARGET_PREFIX"
-  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
+  export CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
 }
 
 post_make_target() {