* [Buildroot] [PATCH 1/3] package/tvheadend: Bump version
@ 2014-11-16 12:26 Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 2/3] package/tvheadend: add support for host-python3 Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Bernd Kuhls @ 2014-11-16 12:26 UTC (permalink / raw)
To: buildroot
Needed to add support for host-python3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 0fd6eea..0b564f6 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TVHEADEND_VERSION = c053acd84e5cc48a3e70047f228728bf039cfacd
+TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPLv3+
TVHEADEND_LICENSE_FILES = LICENSE.md
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/3] package/tvheadend: add support for host-python3
2014-11-16 12:26 [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Bernd Kuhls
@ 2014-11-16 12:26 ` Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs Bernd Kuhls
2014-11-18 21:59 ` [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Thomas Petazzoni
2 siblings, 0 replies; 11+ messages in thread
From: Bernd Kuhls @ 2014-11-16 12:26 UTC (permalink / raw)
To: buildroot
Added upstream:
https://github.com/tvheadend/tvheadend/commit/5a07ff166a84c65f08d326c69c818f6eef315e68
Tested with these defconfigs:
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_TVHEADEND=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_TVHEADEND=y
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 0b564f6..b0038c8 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -8,7 +8,7 @@ TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPLv3+
TVHEADEND_LICENSE_FILES = LICENSE.md
-TVHEADEND_DEPENDENCIES = host-pkgconf host-python openssl
+TVHEADEND_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) openssl
ifeq ($(BR2_PACKAGE_AVAHI),y)
TVHEADEND_DEPENDENCIES += avahi
@@ -42,7 +42,7 @@ define TVHEADEND_CONFIGURE_CMDS
--prefix=/usr \
--arch="$(ARCH)" \
--cpu="$(BR2_GCC_TARGET_CPU)" \
- --python="$(HOST_DIR)/usr/bin/python2" \
+ --python="$(HOST_DIR)/usr/bin/python" \
--disable-dvbscan \
--enable-bundle \
--disable-libffmpeg_static \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs
2014-11-16 12:26 [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 2/3] package/tvheadend: add support for host-python3 Bernd Kuhls
@ 2014-11-16 12:26 ` Bernd Kuhls
2014-11-18 21:01 ` Arnout Vandecappelle
2014-11-18 21:59 ` [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Thomas Petazzoni
2 siblings, 1 reply; 11+ messages in thread
From: Bernd Kuhls @ 2014-11-16 12:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.mk | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b0038c8..ac3a557 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -35,18 +35,18 @@ endif
TVHEADEND_DEPENDENCIES += dtv-scan-tables
define TVHEADEND_CONFIGURE_CMDS
- (cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --prefix=/usr \
- --arch="$(ARCH)" \
- --cpu="$(BR2_GCC_TARGET_CPU)" \
- --python="$(HOST_DIR)/usr/bin/python" \
- --disable-dvbscan \
- --enable-bundle \
- --disable-libffmpeg_static \
- $(TVHEADEND_CONF_OPTS) \
+ (cd $(@D); \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --prefix=/usr \
+ --arch="$(ARCH)" \
+ --cpu="$(BR2_GCC_TARGET_CPU)" \
+ --python="$(HOST_DIR)/usr/bin/python" \
+ --disable-dvbscan \
+ --enable-bundle \
+ --disable-libffmpeg_static \
+ $(TVHEADEND_CONF_OPTS) \
)
endef
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs
2014-11-16 12:26 ` [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs Bernd Kuhls
@ 2014-11-18 21:01 ` Arnout Vandecappelle
0 siblings, 0 replies; 11+ messages in thread
From: Arnout Vandecappelle @ 2014-11-18 21:01 UTC (permalink / raw)
To: buildroot
On 16/11/14 13:26, Bernd Kuhls wrote:
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
This looks more like adding tabs than removing them...
But actually:
> ---
> package/tvheadend/tvheadend.mk | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index b0038c8..ac3a557 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -35,18 +35,18 @@ endif
> TVHEADEND_DEPENDENCIES += dtv-scan-tables
>
> define TVHEADEND_CONFIGURE_CMDS
> - (cd $(@D); \
> - $(TARGET_CONFIGURE_OPTS) \
> - $(TARGET_CONFIGURE_ARGS) \
> - ./configure \
> - --prefix=/usr \
> - --arch="$(ARCH)" \
> - --cpu="$(BR2_GCC_TARGET_CPU)" \
> - --python="$(HOST_DIR)/usr/bin/python" \
> - --disable-dvbscan \
> - --enable-bundle \
> - --disable-libffmpeg_static \
> - $(TVHEADEND_CONF_OPTS) \
> + (cd $(@D); \
Why don't you remove the redundant parenthesis and avoid one indent level?
> + $(TARGET_CONFIGURE_OPTS) \
> + $(TARGET_CONFIGURE_ARGS) \
> + ./configure \
IMHO it would be nicer if everything below would get an additional indent level.
Regards,
Arnout
> + --prefix=/usr \
> + --arch="$(ARCH)" \
> + --cpu="$(BR2_GCC_TARGET_CPU)" \
> + --python="$(HOST_DIR)/usr/bin/python" \
> + --disable-dvbscan \
> + --enable-bundle \
> + --disable-libffmpeg_static \
> + $(TVHEADEND_CONF_OPTS) \
> )
> endef
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: Bump version
2014-11-16 12:26 [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 2/3] package/tvheadend: add support for host-python3 Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs Bernd Kuhls
@ 2014-11-18 21:59 ` Thomas Petazzoni
2 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2014-11-18 21:59 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sun, 16 Nov 2014 13:26:25 +0100, Bernd Kuhls wrote:
> Needed to add support for host-python3
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/tvheadend/tvheadend.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I've applied patches 1 and 2 to the next branch, but I've marked patch
3 as "Changes Requested", since Arnout made some comments about it. Can
you take them into account and resend?
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
@ 2016-01-23 9:44 Bernd Kuhls
2016-01-25 22:16 ` Thomas Petazzoni
0 siblings, 1 reply; 11+ messages in thread
From: Bernd Kuhls @ 2016-01-23 9:44 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
2016-01-23 9:44 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
@ 2016-01-25 22:16 ` Thomas Petazzoni
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2016-01-25 22:16 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
@ 2017-04-01 19:08 Bernd Kuhls
2017-04-01 20:30 ` Thomas Petazzoni
0 siblings, 1 reply; 11+ messages in thread
From: Bernd Kuhls @ 2017-04-01 19:08 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.hash | 2 +-
package/tvheadend/tvheadend.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index d34dbf1f4..afd651003 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 ac3c088654864781f2b2a2797e3a8b03a1b2e86db731c08cb5f296a04069560d tvheadend-e5f5a4278949afc96e26d6cd50cf968e0e92d7b6.tar.gz
+sha256 e58f5b2fded91fa085961402db26b54d5338c70e5bebdb0f34d55beb4d5551b4 tvheadend-b142383a7cf51180e00ebb1c13205c14d24338dc.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 77843e2b2..b82ebc914 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TVHEADEND_VERSION = e5f5a4278949afc96e26d6cd50cf968e0e92d7b6
+TVHEADEND_VERSION = b142383a7cf51180e00ebb1c13205c14d24338dc
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
@ 2017-04-08 15:18 Bernd Kuhls
2017-04-08 19:44 ` Thomas Petazzoni
0 siblings, 1 reply; 11+ messages in thread
From: Bernd Kuhls @ 2017-04-08 15:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.hash | 3 ++-
package/tvheadend/tvheadend.mk | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index afd651003..fe99e4553 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha256 e58f5b2fded91fa085961402db26b54d5338c70e5bebdb0f34d55beb4d5551b4 tvheadend-b142383a7cf51180e00ebb1c13205c14d24338dc.tar.gz
+sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz
+
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b82ebc914..c2981ff22 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TVHEADEND_VERSION = b142383a7cf51180e00ebb1c13205c14d24338dc
+TVHEADEND_VERSION = 5cbaac172b4997fbf89667d79ac6e03b46460060
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
2017-04-08 15:18 Bernd Kuhls
@ 2017-04-08 19:44 ` Thomas Petazzoni
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2017-04-08 19:44 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 8 Apr 2017 17:18:02 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/tvheadend/tvheadend.hash | 3 ++-
> package/tvheadend/tvheadend.mk | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
> index afd651003..fe99e4553 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,2 +1,3 @@
> # Locally computed
> -sha256 e58f5b2fded91fa085961402db26b54d5338c70e5bebdb0f34d55beb4d5551b4 tvheadend-b142383a7cf51180e00ebb1c13205c14d24338dc.tar.gz
> +sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz
> +
This empty new line at the end of the file was not needed, so I've
removed it and applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-04-08 19:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-16 12:26 [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 2/3] package/tvheadend: add support for host-python3 Bernd Kuhls
2014-11-16 12:26 ` [Buildroot] [PATCH 3/3] package/tvheadend: Remove tabs Bernd Kuhls
2014-11-18 21:01 ` Arnout Vandecappelle
2014-11-18 21:59 ` [Buildroot] [PATCH 1/3] package/tvheadend: Bump version Thomas Petazzoni
2016-01-23 9:44 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
2016-01-25 22:16 ` Thomas Petazzoni
2017-04-01 19:08 Bernd Kuhls
2017-04-01 20:30 ` Thomas Petazzoni
2017-04-08 15:18 Bernd Kuhls
2017-04-08 19:44 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.