Merge pull request #2995 from CvH/9.0/dvb-tools

update and cleanup dvb-tools

packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk

@@ -2,15 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="blindscan-s2"
-PKG_VERSION="94cb626"
-PKG_SHA256="cea70a7c4f3091530fd3cdf6e79e1c7386928678ef89fa5d937e5092c7cf9522"
-PKG_ARCH="any"
+PKG_VERSION="192eaf0b3eccfb9721b3d49b9010b5c1447776e0"
+PKG_SHA256="c9e5bd07672765b30dac758844e2eb87ab68d5dc6bc731e9df6394159acddcbb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://bitbucket.org/majortom/blindscan-s2"
-PKG_URL="https://github.com/persianpros/blindscan-s2/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/PLi-metas/blindscan-s2/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="blindscan-s2 is a program to blindscan digital satellite signals"
 PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals"
 
 makeinstall_target() {

packages/addons/addon-depends/dvb-tools-depends/depends/bitstream/package.mk

@@ -2,15 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bitstream"
-PKG_VERSION="1.3"
-PKG_SHA256="f8a90b0ae517ccb295760317f7809ff097ae220ef75b05b0fc2b813debc4a8b7"
-PKG_ARCH="any"
+PKG_VERSION="1.4"
+PKG_SHA256="b2484940d3b8733bec9dd1ec1731de428261dff31c9f95874264be9dc9ce786b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"
-PKG_URL="http://download.videolan.org/pub/videolan/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="http://download.videolan.org/pub/videolan/bitstream/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF, etc."
-PKG_LONGDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF, etc."
+PKG_LONGDESC="biTStream is a set of C headers allowing a simpler access to binary structures such as specified by MPEG, DVB, IETF."
 
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"

packages/addons/addon-depends/dvb-tools-depends/depends/libev/package.mk

@@ -4,13 +4,11 @@
 PKG_NAME="libev"
 PKG_VERSION="4.24"
 PKG_SHA256="973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://software.schmorp.de/pkg/libev.html"
 PKG_URL="http://dist.schmorp.de/libev/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libev: a full-featured and high-performance event loop"
-PKG_LONGDESC="A full-featured and high-performance event loop that is loosely modelled after libevent, but without its limitations and bugs."
+PKG_LONGDESC="A full-featured and high-performance event loop."
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+                           --enable-static"

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk

@@ -1,18 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvb-apps"
 PKG_VERSION="3d43b280298c"
 PKG_SHA256="70c1d293ea3ddbcb970e01c8a51487ee97a4dcf33a73c0236c7d57757c7f6fb0"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
 PKG_URL="http://linuxtv.org/hg/dvb-apps/archive/${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="Digitial Video Broadcasting (DVB) applications"
-PKG_LONGDESC="Applications and utilities geared towards the initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC standards."
+PKG_LONGDESC="Applications for initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC."
 
 pre_make_target() {
   export PERL_USE_UNSAFE_INC=1
 }
+
+makeinstall_target() {
+ :
+}

packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk

@@ -3,15 +3,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvblast"
-PKG_VERSION="77cfaa8"
-PKG_SHA256="b78eaec73addb328384bf8acb93a1b6a6334f4fa47914f98b91b4cd4fc00b639"
-PKG_ARCH="any"
+PKG_VERSION="acf3844377351ea2949ce1c48dbfde589491013d"
+PKG_SHA256="007d2c93876892bd09c2a520bdce0b04f6469187123bbf24cdcf0d5effec5389"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/projects/dvblast.html"
 PKG_URL="http://repo.or.cz/dvblast.git/snapshot/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain bitstream libev"
-PKG_SECTION="tools"
-PKG_SHORTDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application"
 PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application"
 
 pre_configure_target() {

packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk

@@ -2,15 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dvbsnoop"
-PKG_VERSION="c1ec72f"
-PKG_SHA256="a277434fa78a31493d53a74e2a4f5bbb77e9cc396ec230c64f03e85dc6338e7f"
-PKG_ARCH="any"
+PKG_VERSION="badf61fcdab1177c1162747be06d035a2b671e9b"
+PKG_SHA256="7f0f5d9ca15c5caae3ca249d95a5fc30cececd16f63e00a1404e0d2368ce56fa"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dvbsnoop.sourceforge.net/"
 PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_TOOLCHAIN="autotools"
 

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mumudvb"
-PKG_VERSION="a09373d"
-PKG_SHA256="66ef8f11a0e5795cd6408e33581a95de88a76d499e8a0d41f34880295d346efa"
-PKG_ARCH="any"
+PKG_VERSION="6153f87a17a94fbf6e71d710bef39c313302b494"
+PKG_SHA256="4e8dd903d0cba1e798c3921da83b332a9bbb5ad2102f5c1a9699965af6989e28"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mumudvb.net/"
 PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="MuMuDVB-${PKG_VERSION}*"
 PKG_DEPENDS_TARGET="toolchain libdvbcsa"
-PKG_SECTION="tools"
-PKG_SHORTDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
 PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
 PKG_TOOLCHAIN="autotools"
 

packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="szap-s2"
-PKG_VERSION="69ff358"
+PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c"
 PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
 PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
 PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
 
 makeinstall_target() {

packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="t2scan"
+PKG_VERSION="8b9ad91e8685ff80e7c5d924caec83f1ee49ebf3"
+PKG_SHA256="cdfae6232ba1bbc954bd228f9db217d004c07407cf46245816d39f4599e91111"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/mighty-p/t2scan"
+PKG_URL="https://github.com/mighty-p/t2scan/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files."
+
+# aml 3.14 hack
+pre_configure_target() {
+  if [ "$LINUX" = "amlogic-3.14" -o "$LINUX" = "amlogic-3.10" ]; then
+    sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $PKG_BUILD/configure*
+    sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $PKG_BUILD/configure*
+  fi
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tune-s2"
-PKG_VERSION="60cc4aa"
+PKG_VERSION="60cc4aaa70b646d38f2e40251860375283c44816"
 PKG_SHA256="e39069a0f2f0930809647052fe1f8c9a13f05af537013b03a99f09ceb9bfb997"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
 PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
 PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
 
 makeinstall_target() {

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -4,20 +4,21 @@
 PKG_NAME="w_scan"
 PKG_VERSION="20170107"
 PKG_SHA256="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe"
-PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="tools"
-PKG_SHORTDESC="DVBlast is a small channel scan tool to create an channel.conf for VDR"
-PKG_LONGDESC="DVBlast is a small channel scan tool to create an channel.conf for VDR"
+PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files."
 PKG_TOOLCHAIN="autotools"
 
-# aml 3.14 is meh
+# aml 3.14 hack
 pre_configure_target() {
-if [ $LINUX = "amlogic-3.14" -o $LINUX = "amlogic-3.10" ]; then
-  sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $PKG_BUILD/configure*
-  sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $PKG_BUILD/configure*
-fi
+  if [ "$LINUX" = "amlogic-3.14" -o "$LINUX" = "amlogic-3.10" ]; then
+    sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $PKG_BUILD/configure*
+    sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $PKG_BUILD/configure*
+  fi
+}
+
+makeinstall_target() {
+  :
 }

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

@@ -1,7 +1,15 @@
+105
+- added t2scan
+- updated bitstream to 1.4
+- updated blindscan-s2 to 192eaf0
+- updated dvblast to acf3844
+- updated dvbsnoop to badf61f
+- updated mumudvb to 6153f87
+
 104
 - remove dvb-fe-tool, it's already included in the image
 - updated MuMuDVB to a09373d
-- update dvblast to 77cfaa8
+- updated dvblast to 77cfaa8
 
 103
 - added blindscan-s2

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="dvb-tools"
 PKG_VERSION="1.0"
-PKG_REV="104"
+PKG_REV="105"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,7 +11,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="DVB-Tools: is a bundle of dvb tools and programs"
-PKG_LONGDESC="This bundle currently includes blindscan-s2, dvb-apps, dvblast, dvbsnoop, mumudvb, szap-s2, tune-s2 and w_scan."
+PKG_LONGDESC="This bundle currently includes blindscan-s2, dvb-apps, dvblast, dvbsnoop, mumudvb, szap-s2, tune-s2, t2scan and w_scan."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="DVB Tools"
@@ -25,6 +25,7 @@ PKG_DEPENDS_TARGET="toolchain \
                     mumudvb \
                     szap-s2 \
                     tune-s2 \
+                    t2scan \
                     w_scan"
 
 addon() {
@@ -61,6 +62,9 @@ addon() {
     # tune-s2
     cp -P $(get_build_dir tune-s2)/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
 
+    # t2scan
+    cp -P $(get_build_dir t2scan)/.$TARGET_NAME/t2scan $ADDON_BUILD/$PKG_ADDON_ID/bin
+
     # w_scan
     cp -P $(get_build_dir w_scan)/.$TARGET_NAME/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
 }