[Buildroot] [PATCH 1/3] package/tvheadend: bump version

[Buildroot] [PATCH 1/3] package/tvheadend: bump version

[Bernd Kuhls]

Default configure options were changed in
https://github.com/tvheadend/tvheadend/commit/ad9b54ad908fdc9a069c734234958ae8ad1eb38f
enabling the download of the source of libhdhomerun and its static
build which will lead to a link error because the host compiler is used
for that build. Therefore disable the static build of libhdhomerun by
tvheadend's build system like we do for ffmpeg.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/tvheadend/0001-no-check_config.patch | 4 ++--
 package/tvheadend/tvheadend.hash             | 2 +-
 package/tvheadend/tvheadend.mk               | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch
index 6a0cddd..361ebcd 100644
--- a/package/tvheadend/0001-no-check_config.patch
+++ b/package/tvheadend/0001-no-check_config.patch
@@ -12,12 +12,12 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
 --- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile	2014-03-09 14:47:43.780025330 +0100
 +++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile	2014-03-09 14:48:40.836539093 +0100
-@@ -516,7 +516,7 @@
+@@ -566,7 +566,7 @@
  	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
 -${PROG}: .config.mk make_webui $(OBJS)
 +${PROG}: make_webui $(OBJS)
- 	$(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)
+ 	$(pCC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)
  
  # Object
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 9a8432a..de7bc46 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	28b01f22f2d8efa201a782c1fbac68e4818e8982fd02c51497f492c9e547da67	tvheadend-66e5d277a59db723a8718afb3bdbef63824fa050.tar.gz
+sha256	0caf44de3baaf115d80410b660d99e49a42f50792397254e8f21b6e1c5ca58ef	tvheadend-1aa0073be39119f5d0d79212e6c83c470904a161.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 5f28d4a..43ff979 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 66e5d277a59db723a8718afb3bdbef63824fa050
+TVHEADEND_VERSION = 1aa0073be39119f5d0d79212e6c83c470904a161
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -74,6 +74,7 @@ define TVHEADEND_CONFIGURE_CMDS
 			--enable-dvbscan			\
 			--enable-bundle				\
 			--disable-libffmpeg_static		\
+			--disable-hdhomerun_static		\
 			$(TVHEADEND_CONF_OPTS)			\
 	)
 endef
-- 
2.7.0.rc3

[Buildroot] [PATCH 2/3] package/libhdhomerun: fix header install path

[Bernd Kuhls]

Header files are expected to be installed in usr/include/libhdhomerun/

https://packages.debian.org/sid/i386/libhdhomerun-dev/filelist
https://github.com/tvheadend/tvheadend/blob/master/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h#L27

This patch will fix a build error with hdhomerun support enabled in
tvheadend.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libhdhomerun/libhdhomerun.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libhdhomerun/libhdhomerun.mk b/package/libhdhomerun/libhdhomerun.mk
index e3e5f06..16e34c2 100644
--- a/package/libhdhomerun/libhdhomerun.mk
+++ b/package/libhdhomerun/libhdhomerun.mk
@@ -19,8 +19,9 @@ endef
 define LIBHDHOMERUN_INSTALL_STAGING_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/libhdhomerun.so \
 		$(STAGING_DIR)/usr/lib/libhdhomerun.so
+	mkdir -p $(STAGING_DIR)/usr/include/libhdhomerun/
 	$(INSTALL) -m 0644 $(@D)/*.h \
-		$(STAGING_DIR)/usr/include/
+		$(STAGING_DIR)/usr/include/libhdhomerun/
 endef
 
 define LIBHDHOMERUN_INSTALL_TARGET_CMDS
-- 
2.7.0.rc3

[Buildroot] [PATCH 3/3] package/tvheadend: enable optional support for libhdhomerun

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/tvheadend/tvheadend.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 43ff979..11f882a 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -39,6 +39,13 @@ else
 TVHEADEND_CONF_OPTS += --disable-dvbcsa
 endif
 
+ifeq ($(BR2_PACKAGE_LIBHDHOMERUN),y)
+TVHEADEND_DEPENDENCIES += libhdhomerun
+TVHEADEND_CONF_OPTS += --enable-hdhomerun_client
+else
+TVHEADEND_CONF_OPTS += --disable-hdhomerun_client
+endif
+
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
-- 
2.7.0.rc3

[Buildroot] [PATCH 1/3] package/tvheadend: bump version

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 23 Jan 2016 10:44:55 +0100, Bernd Kuhls wrote:
> Default configure options were changed in
> https://github.com/tvheadend/tvheadend/commit/ad9b54ad908fdc9a069c734234958ae8ad1eb38f
> enabling the download of the source of libhdhomerun and its static
> build which will lead to a link error because the host compiler is used
> for that build. Therefore disable the static build of libhdhomerun by
> tvheadend's build system like we do for ffmpeg.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/tvheadend/0001-no-check_config.patch | 4 ++--
>  package/tvheadend/tvheadend.hash             | 2 +-
>  package/tvheadend/tvheadend.mk               | 3 ++-
>  3 files changed, 5 insertions(+), 4 deletions(-)

All three patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com