From 5223957cb8ed84b880ee34c77673d16ddc23b149 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 01/14] libhdhomerun: update to 20180817 --- packages/multimedia/libhdhomerun/package.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/multimedia/libhdhomerun/package.mk index 91667f0cdd..4dea9bc3d6 100644 --- a/packages/multimedia/libhdhomerun/package.mk +++ b/packages/multimedia/libhdhomerun/package.mk @@ -3,15 +3,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libhdhomerun" -PKG_VERSION="20180327" -PKG_SHA256="d91fd3782f9a0834242f7110c44067647843602f8e95052045250b7c229ccbd5" -PKG_ARCH="any" +PKG_VERSION="20180817" +PKG_SHA256="437888b27206f526827ee7a4c57c1c167a36483b0445232e07fb7bb7ee854b42" PKG_LICENSE="LGPL" PKG_SITE="http://www.silicondust.com" PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz" -PKG_SOURCE_DIR="$PKG_NAME" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="driver" PKG_LONGDESC="The library provides functionality to setup the HDHomeRun." PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX" From 9d6d4029b54212538ff36edaf01d6dbac5bdd11f Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 02/14] aom: update to 51b282d --- packages/multimedia/aom/package.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk index c283cb8678..8e494d4afa 100644 --- a/packages/multimedia/aom/package.mk +++ b/packages/multimedia/aom/package.mk @@ -2,14 +2,12 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aom" -PKG_VERSION="96ee0eb" -PKG_SHA256="37c8d930cc105ccad4987c65751400fc42819b77fd487c9ef19cadee0c95a2d8" -PKG_ARCH="any" +PKG_VERSION="51b282d13d5ee58dadf45164fc49a6e034333478" +PKG_SHA256="15a2f7960da99f865bd4da1e60b110e2220115851d60a1bb042465ff99c0bc83" PKG_LICENSE="BSD" PKG_SITE="https://www.webmproject.org" PKG_URL="http://repo.or.cz/aom.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="multimedia" PKG_LONGDESC="AV1 Codec Library" PKG_CMAKE_OPTS_TARGET="-DENABLE_CCACHE=1 \ From 9dda09dd6935964089901400fa252937d59f2e2d Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 03/14] tvh-dtv-scan-tables: update to 47f11c5 --- .../addons/addon-depends/tvh-dtv-scan-tables/package.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk index 51715e7a96..f28c4e3431 100644 --- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk +++ b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk @@ -2,13 +2,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tvh-dtv-scan-tables" -PKG_VERSION="4258e52" -PKG_SHA256="48de5baa843ecd5a2231e9b007fc6b3fd86739ddd075158b31fcdefdcd3ce2dd" -PKG_ARCH="any" +PKG_VERSION="47f11c5680863858e43e7feb3d48cc22575da0ae" +PKG_SHA256="2c34829c9a263449d1227f31dc3ad5e348e2ba742661b5b021eef6175f21931d" PKG_LICENSE="GPL" PKG_SITE="https://github.com/tvheadend" PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.gz" -PKG_SOURCE_DIR="dtv-scan-tables-${PKG_VERSION}*" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Digital TV scan tables, a fork from Tvh to support more recent tables" PKG_TOOLCHAIN="manual" From 6f0dda6cd8ee3d8b780b31eda5dff08d17b5c5bd Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 04/14] x264: update to 20181001 --- .../addons/addon-depends/ffmpegx-depends/x264/package.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk index 02f76b4143..67d946ec25 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk @@ -2,15 +2,13 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="x264" -PKG_VERSION="snapshot-20180627-2245" -PKG_SHA256="4fa2bcd818fa0ec197c027b3d38ba587ebc4cfb956c2b24deb37e69a46999daf" -PKG_ARCH="any" +PKG_VERSION="snapshot-20181001-2245" +PKG_SHA256="edea9b8621da02ebe748101222c974f8a640b19d9d3a3790a24130b892dd7445" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/x264.html" PKG_URL="https://download.videolan.org/x264/snapshots/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="multimedia" -PKG_LONGDESC="x264" +PKG_LONGDESC="x264 codec" pre_configure_target() { cd $PKG_BUILD From 220d721b6e28e8f18c86183bc4a9195028c52c4f Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 05/14] ffmpegx: update to 4.0.2 --- packages/addons/addon-depends/ffmpegx/package.mk | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 0ab4dd738b..78206ebff9 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -2,15 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ffmpegx" -PKG_VERSION="4.0.1" -PKG_SHA256="cbb7c3ed5b7a669962dfe7c58dc495279274ac259e75770cccf2d2b0115ff5fb" -PKG_ARCH="any" +PKG_VERSION="4.0.2" +PKG_SHA256="5ec8d580ef8c357e79f46bf00faaf1c237e1377b1b473a42ea1c3b0fb80b6123" PKG_LICENSE="LGPLv2.1+" PKG_SITE="https://ffmpeg.org" PKG_URL="https://github.com/FFmpeg/FFmpeg/archive/n${PKG_VERSION}.tar.gz" -PKG_SOURCE_DIR="FFmpeg-n${PKG_VERSION}" PKG_DEPENDS_TARGET="toolchain aom bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib" -PKG_SECTION="multimedia" PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding" PKG_BUILD_FLAGS="-gold" @@ -39,10 +36,6 @@ pre_configure_target() { PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm" fi - if [ "$TARGET_ARCH" == "arm" ]; then - PKG_FFMPEG_ARM_AO="--enable-hardcoded-tables" - fi - # HW encoders # RPi 0-3 @@ -177,7 +170,7 @@ configure_target() { --enable-openssl \ \ `#Advanced options` \ - $PKG_FFMPEG_ARM_AO \ + --disable-hardcoded-tables \ } From a518a2affe1761f2370b93a6bfefad51acfc14e5 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 06/14] x265: cleanup --- packages/addons/addon-depends/ffmpegx-depends/x265/package.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk index e1579afecc..cc2a79fd98 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk @@ -7,10 +7,8 @@ PKG_SHA256="6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://www.videolan.org/developers/x265.html" -PKG_URL="http://download.videolan.org/pub/videolan/$PKG_NAME/${PKG_NAME}_${PKG_VERSION}.tar.gz" -PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}" +PKG_URL="http://download.videolan.org/pub/videolan/x265/${PKG_NAME}_${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="multimedia" PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library" PKG_TOOLCHAIN="make" From 7dd654b4896a147326aaf2bb1a23cc5d6c65b9f3 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 07/14] libvpx: cleanup --- .../addons/addon-depends/ffmpegx-depends/libvpx/package.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk index cb939b5abf..215a52c3a5 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk @@ -4,14 +4,11 @@ PKG_NAME="libvpx" PKG_VERSION="1.7.0" PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238" -PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="https://www.webmproject.org" PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain yasm:host" -PKG_SECTION="multimedia" -PKG_SHORTDESC="WebM VP8/VP9 Codec SDK" -PKG_LONGDESC="The WebM Project is dedicated to developing a high-quality, open video format for the web that's freely available to everyone." +PKG_LONGDESC="WebM VP8/VP9 Codec" configure_target() { From 473f15344a6276f7fb0905625f20ed7086ecef4d Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 08/14] fdk-aac: cleanup --- .../addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk index a9bac5f8d3..5e676d1560 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk @@ -4,11 +4,9 @@ PKG_NAME="fdk-aac" PKG_VERSION="0.1.6" PKG_SHA256="adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3" -PKG_ARCH="any" PKG_LICENSE="other" PKG_SITE="https://sourceforge.net/projects/opencore-amr/" PKG_URL="https://github.com/mstorsjo/fdk-aac/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="multimedia" PKG_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android." PKG_TOOLCHAIN="autotools" From 447bf535f238658221d627b0ea93f9f9526b61b8 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 09/14] opus: update to 1.3-rc2 --- packages/addons/addon-depends/opus/package.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/opus/package.mk b/packages/addons/addon-depends/opus/package.mk index eb4b98ac93..88ff30a927 100644 --- a/packages/addons/addon-depends/opus/package.mk +++ b/packages/addons/addon-depends/opus/package.mk @@ -2,15 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="opus" -PKG_VERSION="1.2.1" -PKG_SHA256="cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732" -PKG_ARCH="any" +PKG_VERSION="1.3-rc2" +PKG_SHA256="f6bab321fb81db984766f1e4d340a9e71a5ca2c5d4d53f4ee072e84afda271ca" PKG_LICENSE="BSD" PKG_SITE="http://www.opus-codec.org" -PKG_URL="https://archive.mozilla.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://archive.mozilla.org/pub/opus/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="audio" -PKG_SHORTDESC="Codec designed for interactive speech and audio transmission over the Internet" PKG_LONGDESC="Codec designed for interactive speech and audio transmission over the Internet" if [ "$TARGET_ARCH" = "arm" ]; then From 68e30171bb827f0417114523fd2eae73f93fcd59 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 10/14] argtable2: initial package --- .../addons/addon-depends/argtable2/package.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/addons/addon-depends/argtable2/package.mk diff --git a/packages/addons/addon-depends/argtable2/package.mk b/packages/addons/addon-depends/argtable2/package.mk new file mode 100644 index 0000000000..c8db7ee657 --- /dev/null +++ b/packages/addons/addon-depends/argtable2/package.mk @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="argtable2" +PKG_VERSION="2.13" +PKG_SHA256="8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf" +PKG_LICENSE="BSD" +PKG_SITE="http://argtable.sourceforge.net/" +PKG_URL="https://downloads.sourceforge.net/project/argtable/argtable/argtable-${PKG_VERSION}/argtable2-${PKG_VERSION:2:4}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="Argtable is an open source ANSI C library that parses GNU-style command-line options" + +make_target() { + : +} From 57280950c191b3006ac80bd56dadebbeaeddfc5a Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 11/14] comskip: initial package --- .../addons/addon-depends/comskip/package.mk | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/addons/addon-depends/comskip/package.mk diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk new file mode 100644 index 0000000000..90d920c522 --- /dev/null +++ b/packages/addons/addon-depends/comskip/package.mk @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="comskip" +PKG_VERSION="6030aa0d3b589161ec96c6c986c48aa826fb9f72" +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_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings" +PKG_TOOLCHAIN="autotools" + +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() { + : +} From 45c2c3435b354dc7585b2dc70c62f73f5f0e984e Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 12/14] tvheadend42: fix to work without network --- .../tvheadend42/source/system.d/service.tvheadend42.service | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service b/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service index e92c783ee8..06f0c67086 100644 --- a/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service +++ b/packages/addons/service/tvheadend42/source/system.d/service.tvheadend42.service @@ -1,7 +1,6 @@ [Unit] Description=TVHeadend42 Service After=network-online.service -Requires=network-online.service [Service] ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.tvheadend42/bin/tvheadend42.start" From cdade1b517cc9f645fde9281955a27f4a6a2f612 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 13/14] tvheadend42: update to 4.2.6-42 --- .../addons/service/tvheadend42/changelog.txt | 6 ++ .../addons/service/tvheadend42/package.mk | 13 +-- .../tvheadend42/source/bin/tvheadend42.start | 8 ++ .../source/defaults/comskip/comskip.ini | 83 +++++++++++++++++++ .../tvheadend42/source/resources/settings.xml | 2 +- .../tvheadend42/source/settings-default.xml | 2 +- 6 files changed, 106 insertions(+), 8 deletions(-) create mode 100644 packages/addons/service/tvheadend42/source/defaults/comskip/comskip.ini diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt index e0da2e9fb8..92049c6a99 100644 --- a/packages/addons/service/tvheadend42/changelog.txt +++ b/packages/addons/service/tvheadend42/changelog.txt @@ -1,3 +1,9 @@ +116 +- added comskip +- update to 4.2.6-42 +- fix Tvheadend works now without network too +- fix for AVM IPs were not set correctly + 115 - update to 4.2.6-7 diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 67dc86caa5..12cf576273 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -2,16 +2,16 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tvheadend42" -PKG_VERSION="5613551" -PKG_SHA256="eff2d5aa08d7c91595d2ec4d4dda2f1bedc07ee8672d1ffb5ed994e284714f23" -PKG_VERSION_NUMBER="4.2.6-7" -PKG_REV="115" +PKG_VERSION="406ba887cfa7cee06c1e0f37cd45dbec3188abcd" +PKG_SHA256="6670c4061f5869674beb525f157e6a66c05c2218bfff8114e15d66f94391554a" +PKG_VERSION_NUMBER="4.2.6-42" +PKG_REV="116" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz" -PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*" -PKG_DEPENDS_TARGET="toolchain avahi curl dvb-apps ffmpegx libdvbcsa libhdhomerun libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables" +PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \ + libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables" PKG_SECTION="service" PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux" PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T" @@ -112,6 +112,7 @@ addon() { cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_build_dir comskip)/.install_pkg/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin #dvb-scan files mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan diff --git a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start index 45241a2497..324114957d 100755 --- a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start +++ b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start @@ -9,6 +9,9 @@ oe_setup_addon service.tvheadend42 ADDON_SETTINGS="$ADDON_HOME/settings.xml" +COMSKIP_DIR="$ADDON_HOME/comskip" +COMSKIP_SETTINGS_FILE="$COMSKIP_DIR/comskip.ini" + DVR_SETTINGS_DIR="$ADDON_HOME/dvr/config" DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/8d0f5b7ae354d956d7fe5db25f5d0d24" @@ -43,6 +46,11 @@ if [ -f "$ADDON_HOME/channel/config/tag.tmp" ]; then fi # copy config files to userdata +if [ ! -f "$COMSKIP_SETTINGS_FILE" ]; then + mkdir -p $COMSKIP_DIR + cp $ADDON_DIR/defaults/comskip/comskip.ini $COMSKIP_SETTINGS_FILE +fi + if [ ! -f "$DVR_SETTINGS_FILE" ]; then mkdir -p $DVR_SETTINGS_DIR cp $ADDON_DIR/defaults/dvr/config/8d0f5b7ae354d956d7fe5db25f5d0d24 $DVR_SETTINGS_FILE diff --git a/packages/addons/service/tvheadend42/source/defaults/comskip/comskip.ini b/packages/addons/service/tvheadend42/source/defaults/comskip/comskip.ini new file mode 100644 index 0000000000..bf857d44d8 --- /dev/null +++ b/packages/addons/service/tvheadend42/source/defaults/comskip/comskip.ini @@ -0,0 +1,83 @@ +; See comskip.txt in the distribution zip file for many settable parameters, read manual.html, tuning.html and debugwindow.html for how to tune and debug comskip +edl_mode=3 ; the mode specified in the generated edl file, 0=cut, 3=commercial break +mkv_time_offset=30.0 ; offset in seconds, to work around what appears to be an Kodi or ffmpeg bug +always_keep_first_seconds=2 ; Kodi has a bug that causes a segfault if we don't keep the start of the stream, I'll fix that when I get a chance + +detect_method=43 ; 1=black frame, 2=logo, 4=scene change, 8=fuzzy logic, 16=closed captions, 32=aspect ration, 64=silence, 128=cutscenes, 255=all +validate_silence=1 ; Default, set to 0 to force using this clues if selected above. +validate_uniform=1 ; Default, set to 0 to force using this clues (like pure white frames) if blackframe is selected above. +validate_scenechange=1 ; Default, set to 0 to force using this clues if selected above. +verbose=10 ; show a lot of extra info, level 5 is also OK, set to 0 to disable +max_brightness=60 ; frame not black if any pixels checked are greater than this (scale 0 to 255) +test_brightness=40 ; frame not pure black if any pixels checked are greater than this, will check average brightness (scale 0 to 255) +max_avg_brightness=25 ; maximum average brightness for a dim frame to be considered black (scale 0 to 255) 0 means autosetting +max_commercialbreak=600 ; maximum length in seconds to consider a segment a commercial break +min_commercialbreak=25 ; minimum length in seconds to consider a segment a commercial break +max_commercial_size=125 ; maximum time in seconds for a single commercial or multiple commercials if no breaks in between +min_commercial_size=4 ; mimimum time in seconds for a single commercial +min_show_segment_length=250 ; any segment longer than this will be scored towards show. +non_uniformity=500 ; Set to 0 to disable cutpoints based on uniform frames +max_volume=500 ; any frame with sound volume larger than this will not be regarded as black frame +min_silence=12 ; Any deep silence longer than this amount of frames is a possible cutpoint +ticker_tape=0 ; Amount of pixels from bottom to ignore in all processing +logo_at_bottom=0 ; Set to 1 to search only for logo at the lower half of the video, do not combine with subtitle setting +punish=0 ; Compare to average for sum of 1=brightness, 2=uniform 4=volume, 8=silence, 16=schange, set to 0 to disable +punish_threshold=1.3 ; Multiply when amount is above average * punish_threshold +punish_modifier=2 ; When above average * threshold multiply score by this value +intelligent_brightness=0 ; Set to 1 to use a USA specific algorithm to tune some of the settings, not adviced outside the USA +logo_percentile=0.92 ; if more then this amount of logo is found then logo detection will be disabled +logo_threshold=0.75 +punish_no_logo=1 ; Default, set to 0 to avoid show segments without logo to be scored towards commercial +aggressive_logo_rejection=0 +connect_blocks_with_logo=1 ; set to 1 if you want successive blocks with logo on the transition to be regarded as connected, set to 0 to disable +logo_filter=0 ; set the size of the filter to apply to bad logo detection, 4 seems to be a good value. +cut_on_ar_change=1 ; set to 1 if you want to cut also on aspect ratio changes when logo is present, set to 2 to force cuts on aspect ratio changes. set to 0 to disable +delete_show_after_last_commercial=0 ; set to 1 if you want to delete the last block if its a show and after a commercial +delete_show_before_or_after_current=0 ; set to 1 if you want to delete the previous and the next show in the recording, this can lead to the deletion of trailers of next show +delete_block_after_commercial=0 ; set to max size of block in seconds to be discarded, set to 0 to disable +remove_before=0 ; amount of seconds of show to be removed before ALL commercials +remove_after=0 ; amount of seconds of show to be removed after ALL commercials +shrink_logo=5 ; Reduce the duration of the logo with this amount of seconds +after_logo=0 ; set to number of seconds after logo disappears comskip should start to search for silence to insert an additional cutpoint +padding=0 +ms_audio_delay=5 +volume_slip=40 +skip_b_frames=0 ; Set to 1 to force Comskip to skip frames for higher processing speed. +hardware_decode=0 ; Set to 1 to enable hardware accelerated video decoding, only available in donator version +max_repair_size=200 ; Will repair maximum 200 missing MPEG frames in the timeline, set to 0 to disable repairing for players that don't use PTS. +disable_heuristics=4 ; bit pattern for disabling heuristics, adding 1 disables heristics 1, adding 2 disables heristics 2, adding 4 disables heristics 3, 255 disables all heuristics +delete_logo_file=0 ; set to 1 if you want comskip to tidy up after finishing +output_framearray=0 ; create a big excel file for detailed analysis, set to 0 to disable +output_data=0 ; create a dump of the user data channel, used for CC and XDS (such as V-Chip info). Can be use together with output_framearray to remote debug CC decoding +output_videoredo=0 ; The old videoredo format +output_videoredo3=0 ; The new videoredo v3 format. +output_womble=0 +output_mls=0 ; set to 1 if you want MPeg Video Wizard bookmark file output +output_cuttermaran=0 +output_mpeg2schnitt=0 +output_mpgtx=0 +output_dvrcut=0 +output_zoomplayer_chapter=0 +output_zoomplayer_cutlist=0 +output_edl=1 +output_dvrmstb=0 ; Set to 1 if you're running DVRMS-Toolbox +output_edlx=0 +output_vcf=0 +output_bsplayer=0 +output_btv=0 ; set to 1 if you want Beyond TV chapter cutlist output +output_projectx=0 ; set to 1 if you want ProjectX cutlist output (Xcl) +output_avisynth=0 +output_vdr=1 ; set to 1 if you want Kodi to skipping commercials +output_demux=0 ; set to 1 if you want comskip to demux the mpeg file while scanning +sage_framenumber_bug=0 +sage_minute_bug=0 +live_tv=0 ; set to 1 if you use parallelprocessing and need the output while recording +live_tv_retries=4 ; change to 16 when using live_tv in BTV, used for mpeg PS and TS +dvrms_live_tv_retries=300 ; only used for dvr_ms +standoff=0 ; change to 8000000 when using live_tv in BTV + +cuttermaran_options="cut=\"true\" unattended=\"true\" muxResult=\"false\" snapToCutPoints=\"true\" closeApp=\"true\"" +mpeg2schnitt_options="mpeg2schnitt.exe /S /E /R25 /Z %2 %1" +avisynth_options="LoadPlugin(\"MPEG2Dec3.dll\") \nMPEG2Source(\"%s\")\n" +dvrcut_options="dvrcut \"%s.dvr-ms\" \"%s_clean.dvr-ms\" " +windowtitle="Comskip - %s" \ No newline at end of file diff --git a/packages/addons/service/tvheadend42/source/resources/settings.xml b/packages/addons/service/tvheadend42/source/resources/settings.xml index 33599b7e01..689d3b5556 100644 --- a/packages/addons/service/tvheadend42/source/resources/settings.xml +++ b/packages/addons/service/tvheadend42/source/resources/settings.xml @@ -41,7 +41,7 @@ - + diff --git a/packages/addons/service/tvheadend42/source/settings-default.xml b/packages/addons/service/tvheadend42/source/settings-default.xml index 1b5688d658..774e8bd51b 100644 --- a/packages/addons/service/tvheadend42/source/settings-default.xml +++ b/packages/addons/service/tvheadend42/source/settings-default.xml @@ -1,6 +1,6 @@ - + eth0 192.168.178.201 192.168.178.202 192.168.178.203 From dd5773223bfe141738928b1aba16aecc1207477a Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 2 Oct 2018 17:26:44 +0200 Subject: [PATCH 14/14] ffmpeg-tools: update to 103 --- packages/addons/tools/ffmpeg-tools/changelog.txt | 5 +++++ packages/addons/tools/ffmpeg-tools/package.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/addons/tools/ffmpeg-tools/changelog.txt b/packages/addons/tools/ffmpeg-tools/changelog.txt index 29563a3834..653777dbf8 100644 --- a/packages/addons/tools/ffmpeg-tools/changelog.txt +++ b/packages/addons/tools/ffmpeg-tools/changelog.txt @@ -1,3 +1,8 @@ +103 +- Update AV1 to 20181002 +- Update FFmpeg to 4.0.2 +- Update X264 to 20181001 + 102 - Rename binary to ffmpeg (no ffmpegx anymore) - Update AV1 to 96ee0eb diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index 573afeddce..32e5a3471b 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="102" +PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv"