hts-tvheadend: upgrade hts-tvheadend to version a76f365

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

@@ -1,3 +1,8 @@
+2.0.8
+- define default recordings folder to /storage/recordings
+- update to hts-tvheadend-a76f365
+- add patch for support IPTV radio streams
+
 2.0.7
 - enable unloading/loading dvb modules on suspend/resume
 - add while loop for restarting tvheadend if it crashes

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="b877800"
-PKG_REV="7"
+PKG_VERSION="a76f365"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-a76f365-092-deliver_raw_teletext_to_clients.patch

@@ -1,7 +1,8 @@
 From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
 Date: Fri, 30 Sep 2011 12:56:01 +0200
-Subject: [PATCH] Deliver raw teletext to clients that are able to display it (e.g. XBMC)
+Subject: [PATCH 1/2] Deliver raw teletext to clients that are able to display
+ it (e.g. XBMC)
 
 ---
  src/parsers.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,7 +23,7 @@ index 9b7337d..68c7996 100644
  static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len,
  		     uint32_t next_startcode, int sc_offset);
  
-@@ -158,6 +161,10 @@ parse_mpeg_ts(service_t *t, elementary_stream_t *st, const uint8_t *data,
+@@ -158,6 +161,10 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
      parse_aac(t, st, data, len, start);
      break;
  
@@ -33,7 +34,7 @@ index 9b7337d..68c7996 100644
    default:
      break;
    }
-@@ -1232,6 +1239,54 @@ parse_subtitles(service_t *t, elementary_stream_t *st, const uint8_t *data,
+@@ -1232,6 +1239,54 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
    }
  }
  
@@ -92,7 +93,7 @@ diff --git a/src/tsdemux.c b/src/tsdemux.c
 index 897fe1d..5fdaf8b 100644
 --- a/src/tsdemux.c
 +++ b/src/tsdemux.c
-@@ -110,11 +110,10 @@ ts_recv_packet0(service_t *t, elementary_stream_t *st, const uint8_t *tsb)
+@@ -110,11 +110,10 @@
  			   got_section, st);
      break;
  
@@ -108,5 +109,38 @@ index 897fe1d..5fdaf8b 100644
        break;
  
 -- 
-1.7.3.1
+1.7.5.4
+
+
+From a8026cd5b412c5096b0904f060ad5ffccdb883cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
+Date: Thu, 17 Nov 2011 08:25:31 +0100
+Subject: [PATCH 2/2] Disable teletext recording to prevent issues with other
+ elementary streams. Temporary until a better solution
+ is found.
+
+---
+ src/plumbing/globalheaders.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
+index 703591b..7f183d4 100644
+--- a/src/plumbing/globalheaders.c
++++ b/src/plumbing/globalheaders.c
+@@ -202,6 +202,12 @@
+ 						  pkt->pkt_componentindex);
+     assert(ssc != NULL);
+ 
++    if(ssc->ssc_type == SCT_TELETEXT) {
++      free(sm);
++      ssc->ssc_disabled = 1;
++      break;
++    }
++
+     pkt = convertpkt(ssc, pkt);
+ 
+     apply_header(ssc, pkt);
+-- 
+1.7.5.4
+
 

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-b877800-fix_memory_leak_queue_protection.patch

@@ -1,26 +0,0 @@
-From 60e5a1014c52e926fb7dbb12392f60a473e44d2c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
-Date: Fri, 30 Sep 2011 13:23:46 +0200
-Subject: [PATCH] Fix memory leak in queue size protection
-
----
- src/htsp.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/htsp.c b/src/htsp.c
-index 8bb803b..f786a88 100644
---- a/src/htsp.c
-+++ b/src/htsp.c
-@@ -1508,6 +1508,9 @@ htsp_stream_deliver(htsp_subscription_t *hs, th_pkt_t *pkt)
- 
-     hs->hs_dropstats[pkt->pkt_frametype]++;
- 
-+    // destroy the already created htsmsg to avoid memory leaks
-+    htsmsg_destroy(m);
-+
-     /* Queue size protection */
-     pkt_ref_dec(pkt);
-     return;
--- 
-1.7.3.1
-