Merge pull request #3582 from CvH/10.0/tvh_up

Tvheadend update 4.2.8-27

packages/addons/addon-depends/comskip/package.mk

@@ -2,20 +2,25 @@
 # 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 ffmpegx"
 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"
+
+# pass ffmpegx to build
+  PKG_CONFIG_PATH="$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib/pkgconfig"
+  CFLAGS+=" -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include"
+  LDFLAGS+=" -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib"
 }
 
 make_target() {

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"

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"

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"

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

packages/addons/service/tvheadend42/changelog.txt

@@ -1,3 +1,7 @@
+121
+- update to 4.2.8-27
+- update comskip to 2019-03-30
+
 120
 - Use system gnutls
 

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="120"
+PKG_VERSION="5c1b37b50e99f9bf91d38f08f7bd358ee270660f"
+PKG_SHA256="cfce42a6534eec1728b4e84906f845d4805618e584624d1777d038f9377eed98"
+PKG_VERSION_NUMBER="4.2.8-27"
+PKG_REV="121"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
@@ -83,14 +83,14 @@ 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 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() {

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

packages/addons/tools/ffmpeg-tools/changelog.txt

@@ -1,3 +1,8 @@
+108
+- Update aom to 2019-03-05
+- Update x264 to 2019-03-06
+- Update x265 to 3.0
+
 107
 - Use system gnutls
 - Update FFmpeg to 4.1.3
@@ -14,19 +19,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

packages/addons/tools/ffmpeg-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="ffmpeg-tools"
 PKG_VERSION="1.0"
-PKG_REV="107"
+PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

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="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"

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."
 

packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch

@@ -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
-