From 3898246834fd1d691a484c86b2511866dc9d4a13 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 15 Oct 2014 15:50:10 +0300
Subject: [PATCH] tvheadend: update to tvheadend-3.9.1847

closes #3549
---
 .../multimedia/tvheadend/changelog.txt        |  4 ++++
 .../service/multimedia/tvheadend/package.mk   | 17 ++++++++++----
 .../patches/tvheadend-remove-Werror.patch     | 23 +++++++++++++++----
 .../tvheadend/source/bin/tvheadend.start      |  4 ++--
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index 3633a7dd65..12d2a396e3 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,7 @@
+4.3.1
+- update to tvheadend-3.9.1847
+- tvheadend now has native support for hdhomerun devices
+
 4.3.0
 - rebuild for addon api bump
 - update to tvheadend-3.9.1083
diff --git a/packages/addons/service/multimedia/tvheadend/package.mk b/packages/addons/service/multimedia/tvheadend/package.mk
index 40e61044cb..2282d91d57 100644
--- a/packages/addons/service/multimedia/tvheadend/package.mk
+++ b/packages/addons/service/multimedia/tvheadend/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.9.1083"
-PKG_REV="0"
+PKG_VERSION="3.9.1847"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
@@ -36,6 +36,7 @@ PKG_AUTORECONF="no"
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  export CROSS_COMPILE=$TARGET_PREFIX
 }
 
 configure_target() {
@@ -43,12 +44,18 @@ configure_target() {
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
+            --enable-hdhomerun_client \
+            --enable-hdhomerun_static \
             --enable-timeshift \
-            --disable-libav \
             --disable-avahi \
-            --python=$ROOT/$TOOLCHAIN/bin/python \
+            --disable-libav \
+            --enable-inotify \
+            --enable-epoll \
             --disable-uriparser \
-            --enable-bundle
+            --enable-tvhcsa \
+            --enable-bundle \
+            --disable-dbus_1 \
+            --python=$ROOT/$TOOLCHAIN/bin/python
 }
 
 post_make_target() {
diff --git a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch
index 1604c8df9e..d11a0fdf41 100644
--- a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch
+++ b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch
@@ -1,12 +1,25 @@
-diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
---- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
-+++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
-@@ -28,7 +28,7 @@
+From 67e38551bc3acadf27b3ed4922e897348a612fdb Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 15 Oct 2014 13:35:09 +0300
+Subject: [PATCH] remove werror
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ddcc47e..0087a6c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ PROG    := $(BUILDDIR)/tvheadend
  #
  
- CFLAGS  += -g -O2
+ CFLAGS  += -g -O2 -Wunused-result
 -CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 +CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
  CFLAGS  += -Wmissing-prototypes
  CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
  CFLAGS  += -D_FILE_OFFSET_BITS=64
+-- 
+1.7.2.5
+
diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index 64633faad0..e8882e15c6 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -59,9 +59,9 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
 fi
 
 if [ "$DEBUG" = "yes" ]; then
-  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
 else
-  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
 fi
 
 # start userspace DVB driver/addon