From 055cf205e25219e9af3d781740fa0e169ff27ff7 Mon Sep 17 00:00:00 2001
From: afl1 <afl2001@gmail.com>
Date: Sun, 13 Aug 2017 22:43:47 +0200
Subject: [PATCH] tvheadend42: fix for DVB-C annex B

---
 .../addons/service/tvheadend42/changelog.txt  |  4 +--
 .../addons/service/tvheadend42/package.mk     | 19 ++++++------
 .../patches/tvheadend42-04_dvb_c_annexB.patch | 29 +++++++++++++++++++
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 packages/addons/service/tvheadend42/patches/tvheadend42-04_dvb_c_annexB.patch

diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
index ff505784787..1cfef52aff2 100644
--- a/packages/addons/service/tvheadend42/changelog.txt
+++ b/packages/addons/service/tvheadend42/changelog.txt
@@ -1,5 +1,5 @@
-112d
-- release 4.2.3-19
+112e
+- release 4.2.3-20
 
 112
 - release 4.2.2-49
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 125638ef3bd..81f335d3050 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -17,15 +17,16 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="490b6f2"
-PKG_VERSION_NUMBER="4.2.3-19"
-PKG_REV="112d"
+PKG_SHA256="d1c6a2fe88c09f953038474f41162cad7913645437d20f68414e9fa4047fe21a"
+PKG_VERSION="407c8a3"
+PKG_VERSION_NUMBER="4.2.3-20"
+PKG_REV="112e"
 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 curl dvb-tools libdvbcsa libiconv openssl libhdhomerun pngquant:host Python:host yasm"
+PKG_DEPENDS_TARGET="toolchain curl dvb-tools libdvbcsa libiconv openssl pngquant:host Python:host yasm"
 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"
@@ -37,7 +38,7 @@ PKG_ADDON_TYPE="xbmc.service"
 
 # transcoding only for generic
 if [ "$TARGET_ARCH" = x86_64 ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva-intel-driver"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-vaapi-driver"
   TVH_TRANSCODING="--enable-ffmpeg_static --enable-libav --enable-libfdkaac --disable-libtheora --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 --disable-qsv"
 else
   TVH_TRANSCODING="--disable-ffmpeg_static --disable-libav"
@@ -64,21 +65,21 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --enable-trace \
                            --nowerror \
                            --disable-bintray_cache \
-                           --python=$ROOT/$TOOLCHAIN/bin/python"
+                           --python=$TOOLCHAIN/bin/python"
 
 post_unpack() {
   sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
-  sed -e 's|'/usr/bin/pngquant'|'$ROOT/$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
+  sed -e 's|'/usr/bin/pngquant'|'$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
 }
 
 pre_configure_target() {
 # fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
 # transcoding
   if [ "$TARGET_ARCH" = x86_64 ]; then
-    export AS=$ROOT/$TOOLCHAIN/bin/yasm
+    export AS=$TOOLCHAIN/bin/yasm
     export LDFLAGS="$LDFLAGS -lX11 -lm -lvdpau -lva -lva-drm -lva-x11"
     export ARCH=$TARGET_ARCH
   fi
diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-04_dvb_c_annexB.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-04_dvb_c_annexB.patch
new file mode 100644
index 00000000000..43b98470933
--- /dev/null
+++ b/packages/addons/service/tvheadend42/patches/tvheadend42-04_dvb_c_annexB.patch
@@ -0,0 +1,29 @@
+diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
+index 049d0555c..bef025464 100644
+--- a/src/input/mpegts/dvb_psi.c
++++ b/src/input/mpegts/dvb_psi.c
+@@ -2710,7 +2710,10 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
+     psi_tables_atsc_t(mm);
+     break;
+   case DVB_SYS_DVBC_ANNEX_B:
+-    psi_tables_atsc_c(mm);
++    if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class))
++      psi_tables_dvb(mm);
++    else
++      psi_tables_atsc_c(mm);
+     break;
+   case DVB_SYS_NONE:
+   case DVB_SYS_DVBH:
+diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
+index 35bc57a17..f80c65f24 100644
+--- a/src/input/mpegts/mpegts_mux_dvb.c
++++ b/src/input/mpegts/mpegts_mux_dvb.c
+@@ -296,6 +296,7 @@ dvb_mux_dvbc_class_delsys_enum (void *o, const char *lang)
+ {
+   htsmsg_t *list = htsmsg_create_list();
+   htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_A));
++  htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_B));
+   htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_C));
+   return list;
+ }
+