sdcard+osx - Updated with [master] changes

config/functions

@@ -358,7 +358,6 @@ fi
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - XBMC PVR/DVB support:\t\t $PVR"
   config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
   config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 

config/options

@@ -9,9 +9,6 @@ else
   PROJECT="$PROJECT"
 fi
 
-# you are a noob: 'Yes' is not 'yes' :)
-PVR=`echo $PVR | tr A-Z a-z`
-
 # determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
 # default is i386
 if [ -z "$ARCH" ]; then

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,6 @@
+2.1.3
+- bump addon version for new kernel
+
 2.1.2
 - dvbhdhomerun upgraded to 0.0.10
 

packages/addons/driver/hdhomerun/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="2.0"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

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

@@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
   cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend
+  cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend

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

@@ -34,7 +34,7 @@ cd $PKG_BUILD
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
-            --enable-bundle \
             --release
 
 make
+make build.linux/tvheadend.bundle

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

@@ -1,5 +1,4 @@
-2.1.4
-- update to hts-tvheadend-7630970
+2.1.5
 - add an option to wait for more than 1 adapters to appear
 
 2.1.3

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

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="7630970"
-PKG_REV="4"
+PKG_VERSION="78213a0"
+PKG_REV="5"
 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-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch

@@ -0,0 +1,55 @@
+diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
+--- hts-tvheadend-c88a646/src/linuxtv_muxes.h	2011-09-26 20:18:12.000000000 +0200
++++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h	2011-10-18 13:40:37.768853992 +0200
+@@ -12001,6 +12001,39 @@
+ 	{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
+ };
+
++static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
++	{ .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
++	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++};
++
+ static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
+ 	{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
+ 	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
+@@ -12881,6 +12914,11 @@
+
+ static const struct network networks_DVBC_ch[] = {
+ 	{
++		.name = "GA-Weissenstein",
++		.muxes = muxes_DVBC_ch_GA_Weissenstein,
++		.nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
++	},
++	{
+ 		.name = "Rega-Sense",
+ 		.muxes = muxes_DVBC_ch_Rega_Sense,
+ 		.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),

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

@@ -0,0 +1,146 @@
+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 1/2] Deliver raw teletext to clients that are able to display
+ it (e.g. XBMC)
+
+---
+ src/parsers.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/tsdemux.c |    7 +++----
+ 2 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/src/parsers.c b/src/parsers.c
+index 9b7337d..68c7996 100644
+--- a/src/parsers.c
++++ b/src/parsers.c
+@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data
+ static void parse_subtitles(service_t *t, elementary_stream_t *st, 
+ 			    const uint8_t *data, int len, int start);
+
++static void parse_teletext(service_t *t, elementary_stream_t *st, 
++			    const uint8_t *data, int len, int start);
++
+ 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 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
+     parse_aac(t, st, data, len, start);
+     break;
+
++  case SCT_TELETEXT:
++    parse_teletext(t, st, data, len, start);
++    break;
++
+   default:
+     break;
+   }
+@@ -1232,6 +1239,54 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
+   }
+ }
+
++/**
++ * Teletext parser
++ */
++static void
++parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data,
++		int len, int start)
++{
++  th_pkt_t *pkt;
++  int psize, hlen;
++  const uint8_t *buf;
++  const uint8_t *d;
++  if(start) {
++    st->es_parser_state = 1;
++    st->es_buf.sb_err = 0;
++    st->es_parser_ptr = 0;
++    sbuf_reset(&st->es_buf);    
++  }
++
++  if(st->es_parser_state == 0)
++    return;
++
++  sbuf_append(&st->es_buf, data, len);
++
++  if(st->es_buf.sb_ptr < 6)
++    return;
++  d = st->es_buf.sb_data;
++
++  psize = d[4] << 8 | d[5];
++
++  if(st->es_buf.sb_ptr != psize + 6)
++    return;
++
++  st->es_parser_state = 0;
++
++  hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6);
++  if(hlen < 0)
++    return;
++
++  psize -= hlen;
++  buf = d + 6 + hlen;
++  
++  if(psize >= 46) {
++
++      pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts);
++      pkt->pkt_commercial = t->s_tt_commercial_advice;
++      parser_deliver(t, st, pkt);
++  }	
++}
+
+ /**
+  *
+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 @@
+ 			   got_section, st);
+     break;
+
+-  case SCT_TELETEXT:
+-    teletext_input(t, st, tsb);
+-    break;
+-
+   default:
++    if(st->es_type == SCT_TELETEXT)
++      teletext_input(t, st, tsb);
++
+     if(off > 188)
+       break;
+
+-- 
+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
+
+