package/tvheadend: Bump version
PATCH 1/3 package/tvheadend: Bump version
Needed to add support for host-python3
--- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +1 -1
@@ -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
Signature · 1 line
1.7.10.4
PATCH 2/3 package/tvheadend: add support for host-python3
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
--- package/tvheadend/tvheadend.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/tvheadend/tvheadend.mk +2 -2
@@ -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 \
Signature · 1 line
1.7.10.4
PATCH 3/3 package/tvheadend: Remove tabs
In reply to Bernd Kuhls--- package/tvheadend/tvheadend.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
package/tvheadend/tvheadend.mk +12 -12
@@ -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
Signature · 1 line
1.7.10.4
PATCH 3/3 package/tvheadend: Remove tabs
Quoted 2 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
This looks more like adding tabs than removing them...
But actually:
Quoted 15 lines
--- package/tvheadend/tvheadend.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)package/tvheadend/tvheadend.mk +0
-3@@ -35,18 +35,18 @@ endif TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \
package/tvheadend/tvheadend.mk endif · line 38
Quoted 10 lines
package/tvheadend/tvheadend.mk +1
-9- ./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?
package/tvheadend/tvheadend.mk endif · line 41
Quoted 3 lines
package/tvheadend/tvheadend.mk +3
-0+ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \
IMHO it would be nicer if everything below would get an additional indent level.
Regards,
Arnout
Quoted 12 lines
package/tvheadend/tvheadend.mk +8
-0+ --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
Signature · 6 lines
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
PATCH 1/3 package/tvheadend: Bump version
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 6 lines · Bernd Kuhls
Needed to add support for host-python3
Signed-off-by Bernd Kuhls <[email protected]>--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com