Merge pull request #1737 from stefansaraev/tvheadend

tvheadend update

packages/addons/service/multimedia/tvheadend/addon

@@ -29,3 +29,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   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

packages/addons/service/multimedia/tvheadend/build

@@ -37,3 +37,6 @@ cd $PKG_BUILD
             --enable-bundle
 
 make
+
+# compile capmt_ca.so library
+$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,7 @@
+3.0.3
+- update to TVHeadend 3.3.328
+- add an option to preload capmt_ca.so library
+
 3.0.2
 - update to TVHeadend 3.2.18
 

packages/addons/service/multimedia/tvheadend/config/settings.xml

@@ -4,4 +4,5 @@
     <setting id="XMLTV_LOCATION_FILE" value="" />
     <setting id="XMLTV_LOCATION_WEB" value="http://" />
     <setting id="XMLTV_TYPE" value="NONE" />
+    <setting id="PRELOAD_CAPMT_CA" value="false" />
 </settings>

packages/addons/service/multimedia/tvheadend/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.2.18"
+PKG_VERSION="3.3.328"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="$ICONV avahi openssl"
-PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl"
+PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -119,6 +119,11 @@ mkdir -p $ADDON_HOME
         sleep 1
         continue
       fi
-      $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+      if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
+        logger -t Tvheadend "### Preloading capmt_ca.so library ###"
+        LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+      else
+        $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+      fi
     done &
   fi

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.stop

@@ -31,5 +31,5 @@ mkdir -p "$LOCKDIR"
 touch "$LOCKDIR/$LOCKFILE"
 
 if [ "$(pidof $ADDON_BIN)" ];then
-  killall -9 $ADDON_BIN
+  killall $ADDON_BIN
 fi

packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml

@@ -12,5 +12,6 @@
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
 	<string id="1023">Number of adapters to wait for</string>
+	<string id="1024">Preload capmt_ca.so library</string>
 
 </strings>

packages/addons/service/multimedia/tvheadend/source/resources/settings.xml

@@ -15,5 +15,6 @@
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
 		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+		<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
     </category>
 </settings>