From 72744f7d07271e5bb6e69b46e485a4ca545ec325 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 3 Oct 2018 22:27:29 +0200
Subject: [PATCH 1/2] tvheadend42: update to 4.2.6-42

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

diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
index 92049c6a99..efd5dd67bd 100644
--- a/packages/addons/service/tvheadend42/changelog.txt
+++ b/packages/addons/service/tvheadend42/changelog.txt
@@ -1,6 +1,6 @@
 116
 - added comskip
-- update to 4.2.6-42
+- update to 4.2.6-62
 - fix Tvheadend works now without network too
 - fix for AVM IPs were not set correctly
 
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 12cf576273..b8649fd079 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="406ba887cfa7cee06c1e0f37cd45dbec3188abcd"
-PKG_SHA256="6670c4061f5869674beb525f157e6a66c05c2218bfff8114e15d66f94391554a"
-PKG_VERSION_NUMBER="4.2.6-42"
+PKG_VERSION="db177a6047769caff02fbf65de7eef00a930a027"
+PKG_SHA256="2d301e54e45dc054181b837a80382d9dec9a659b996aa7411b31d16063046022"
+PKG_VERSION_NUMBER="4.2.6-62"
 PKG_REV="116"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From 8490da861ad493598332d548a61243da4a41c071 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Wed, 3 Oct 2018 22:44:56 +0200
Subject: [PATCH 2/2] comskip: use ffmpeg instead of ffmpegx

---
 packages/addons/addon-depends/comskip/package.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk
index fa79bd04ef..f224ff665e 100644
--- a/packages/addons/addon-depends/comskip/package.mk
+++ b/packages/addons/addon-depends/comskip/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="df0b4b0354aef5acc17e4e94a20a396fa69c474af7579c94aad09dd490e0ee38"
 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 ffmpegx"
+PKG_DEPENDS_TARGET="toolchain argtable2 ffmpeg"
 PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings"
 PKG_TOOLCHAIN="autotools"
 
@@ -16,11 +16,6 @@ pre_configure_target() {
 
   export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
   export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"
-
-# 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"
 }
 
 make_target() {