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

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

[Bernd Kuhls]

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 4ffb357..6b8fdea 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 1b682a46a11ea821c4ed183a274bc78993ef40a0
+TVHEADEND_VERSION = a27b0af2b82dae83cf8a41e01ee1174b911f3aa3
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.6.2

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

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat,  7 Nov 2015 11:34:17 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/tvheadend/tvheadend.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.

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

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

[Arnout Vandecappelle via buildroot]

On 24/03/2024 14:06, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   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 62c954234d..972db9300e 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,3 +1,3 @@
>   # Locally computed
> -sha256  99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf  tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz
> +sha256  e3f05da73596097757fb4c0f9306e415b1772f26a52b5b86c50d63811e7e65af  tvheadend-c63115464d8f6556fb4cac93ce8740afea1b00d5.tar.gz
>   sha256  16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e  LICENSE.md
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index 816ec6e161..8f2e37b122 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f
> +TVHEADEND_VERSION = c63115464d8f6556fb4cac93ce8740afea1b00d5
>   TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
>   TVHEADEND_LICENSE = GPL-3.0+
>   TVHEADEND_LICENSE_FILES = LICENSE.md
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 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 62c954234d..972db9300e 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf  tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz
+sha256  e3f05da73596097757fb4c0f9306e415b1772f26a52b5b86c50d63811e7e65af  tvheadend-c63115464d8f6556fb4cac93ce8740afea1b00d5.tar.gz
 sha256  16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 816ec6e161..8f2e37b122 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f
+TVHEADEND_VERSION = c63115464d8f6556fb4cac93ce8740afea1b00d5
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Thomas Petazzoni via buildroot]

On Wed,  3 Jan 2024 20:26:25 +0100
Bernd Kuhls <bernd@kuhls.net> wrote:

> Updated license hash due to upstream commit
> https://github.com/tvheadend/tvheadend/commit/3cf5acdc714dc025b2246d2395478fcfd058afeb
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/tvheadend/tvheadend.hash | 4 ++--
>  package/tvheadend/tvheadend.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Updated license hash due to upstream commit
https://github.com/tvheadend/tvheadend/commit/3cf5acdc714dc025b2246d2395478fcfd058afeb

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/tvheadend/tvheadend.hash | 4 ++--
 package/tvheadend/tvheadend.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 5a9ec3df23..62c954234d 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  98a27a6a5ce2fc800df6d154534f494582418f6b24b3a1c30267785d191e50df  tvheadend-62adbebfd062d7b97829268274aad92df2033784.tar.gz
-sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
+sha256  99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf  tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz
+sha256  16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 1d4e6ee30c..816ec6e161 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 62adbebfd062d7b97829268274aad92df2033784
+TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Yann E. MORIN]

Bernd, All,

On 2023-10-26 20:04 +0200, Bernd Kuhls spake thusly:
> Fixes build with python 3.12.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  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 5b021edcc3..5a9ec3df23 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  9d8e68d1442403709846b93e7994652a1eca0f03924924d3a4dd31b882851375  tvheadend-fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a.tar.gz
> +sha256  98a27a6a5ce2fc800df6d154534f494582418f6b24b3a1c30267785d191e50df  tvheadend-62adbebfd062d7b97829268274aad92df2033784.tar.gz
>  sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index f9303ef2fe..1d4e6ee30c 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -TVHEADEND_VERSION = fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a
> +TVHEADEND_VERSION = 62adbebfd062d7b97829268274aad92df2033784
>  TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
>  TVHEADEND_LICENSE = GPL-3.0+
>  TVHEADEND_LICENSE_FILES = LICENSE.md
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Fixes build with python 3.12.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 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 5b021edcc3..5a9ec3df23 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  9d8e68d1442403709846b93e7994652a1eca0f03924924d3a4dd31b882851375  tvheadend-fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a.tar.gz
+sha256  98a27a6a5ce2fc800df6d154534f494582418f6b24b3a1c30267785d191e50df  tvheadend-62adbebfd062d7b97829268274aad92df2033784.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index f9303ef2fe..1d4e6ee30c 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a
+TVHEADEND_VERSION = 62adbebfd062d7b97829268274aad92df2033784
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Thomas Petazzoni via buildroot]

On Sun, 30 Jul 2023 21:15:26 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/tvheadend/tvheadend.hash | 2 +-
>  package/tvheadend/tvheadend.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 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 004619f4f4..5b021edcc3 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  a4ce9ef9299901ebbb5849aba9bb9de3e8f0ab4d1166f1f06ea25997d10d06f6  tvheadend-18effa8ad93e901f3cdaa534123d910f14453d1f.tar.gz
+sha256  9d8e68d1442403709846b93e7994652a1eca0f03924924d3a4dd31b882851375  tvheadend-fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index c0fa83be8a..f9303ef2fe 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 18effa8ad93e901f3cdaa534123d910f14453d1f
+TVHEADEND_VERSION = fe47ecb5504a521fed9c1ca9705fb0dd2bb8443a
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Rebased patch.
 > Upstream removed the dependency to libavresample:
 > https://github.com/tvheadend/tvheadend/commit/17a357fee8bccacd931476411200b05f2b06f47c

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Rebased patch.

Upstream removed the dependency to libavresample:
https://github.com/tvheadend/tvheadend/commit/17a357fee8bccacd931476411200b05f2b06f47c

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

diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch
index 9261e5fff6..45c862d300 100644
--- a/package/tvheadend/0001-no-check_config.patch
+++ b/package/tvheadend/0001-no-check_config.patch
@@ -12,7 +12,7 @@ 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
-@@ -708,7 +708,7 @@
+@@ -710,7 +710,7 @@
  	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 99a24ec011..3d21897c6d 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -63,7 +63,6 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING
 	bool "transcoding support"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	select BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_FFMPEG_AVRESAMPLE
 	select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	# vp8 encoder needs c++
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 45c8bd62b0..004619f4f4 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b  tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz
+sha256  a4ce9ef9299901ebbb5849aba9bb9de3e8f0ab4d1166f1f06ea25997d10d06f6  tvheadend-18effa8ad93e901f3cdaa534123d910f14453d1f.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 0ca8f46dc5..c0fa83be8a 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d
+TVHEADEND_VERSION = 18effa8ad93e901f3cdaa534123d910f14453d1f
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

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 98499eb955..45c8bd62b0 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107  tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz
+sha256  06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b  tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 8ceb7493c8..0ca8f46dc5 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2
+TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Drop patches included in upstream version.
 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Drop patches included in upstream version.
 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

Drop patches included in upstream version.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0002-fix-build-with-libressl.patch        | 47 -------------------
 .../tvheadend/0003-Fix-FTBFS-in-utils-c.patch | 28 -----------
 package/tvheadend/tvheadend.hash              |  2 +-
 package/tvheadend/tvheadend.mk                |  2 +-
 4 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 package/tvheadend/0002-fix-build-with-libressl.patch
 delete mode 100644 package/tvheadend/0003-Fix-FTBFS-in-utils-c.patch

diff --git a/package/tvheadend/0002-fix-build-with-libressl.patch b/package/tvheadend/0002-fix-build-with-libressl.patch
deleted file mode 100644
index c99dacdbeb..0000000000
--- a/package/tvheadend/0002-fix-build-with-libressl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ea65f8025a9124cd7353b21f167968bdb897306f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 6 Apr 2022 21:54:25 +0200
-Subject: [PATCH] fix build with libressl
-
-Fix the following build failure with libressl raised since
-https://github.com/tvheadend/tvheadend/commit/e61acb8ad4a3411f4e7acfd8133d222299f6d47e:
-
-utils.c:(.text+0x1614): undefined reference to `EVP_sha512_256'
-
-Fixes:
- - http://autobuild.buildroot.org/results/cb18f6533806f3729f9718bdcc719384be375b66
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/tvheadend/tvheadend/commit/ea65f8025a9124cd7353b21f167968bdb897306f]
----
- src/http.c  | 2 +-
- src/utils.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 06d5e76172..72a498317c 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -412,7 +412,7 @@ http_send_header(http_connection_t *hc, int rc, const char *content,
-         http_auth_header(&hdrs, realm,
-                          config.http_auth_algo == HTTP_AUTH_ALGO_SHA256 ?
-                            "SHA-256" :
--#if OPENSSL_VERSION_NUMBER >= 0x1010101fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
-                              "SHA-512-256",
- #else
-                              "SHA-256",
-diff --git a/src/utils.c b/src/utils.c
-index d8ffe4ad5c..eecb10e116 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -616,7 +616,7 @@ sha256sum ( const char *str, int lowercase )
- char *
- sha512sum256 ( const char *str, int lowercase )
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010101fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
-   return openssl_hash_hexstr(str, lowercase, EVP_sha512_256(), 32);
- #else
-   return NULL;
diff --git a/package/tvheadend/0003-Fix-FTBFS-in-utils-c.patch b/package/tvheadend/0003-Fix-FTBFS-in-utils-c.patch
deleted file mode 100644
index 2caa281490..0000000000
--- a/package/tvheadend/0003-Fix-FTBFS-in-utils-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fd01737270d98c28465c86a688bd7d1c640486c5 Mon Sep 17 00:00:00 2001
-From: Michael Marley <michael@michaelmarley.com>
-Date: Wed, 6 Apr 2022 21:47:49 -0400
-Subject: [PATCH] Fix FTBFS in utils.c
-
-U+0020 SPACE and U+00A0 NO-BREAK SPACE look the same, but they
-aren't the same.
-
-[Retrieved from:
-https://github.com/tvheadend/tvheadend/commit/fd01737270d98c28465c86a688bd7d1c640486c5]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/utils.c b/src/utils.c
-index eecb10e116..bc6401d22f 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -616,7 +616,7 @@ sha256sum ( const char *str, int lowercase )
- char *
- sha512sum256 ( const char *str, int lowercase )
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010101fL && !defined(LIBRESSL_VERSION_NUMBER)
-   return openssl_hash_hexstr(str, lowercase, EVP_sha512_256(), 32);
- #else
-   return NULL;
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 44ff745221..98499eb955 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e  tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz
+sha256  ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107  tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index d2547b8746..1d1a714505 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0
+TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Arnout Vandecappelle]

On 06/12/2021 20:02, Bernd Kuhls wrote:
> 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 49b102cf8d..db06af53b7 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,3 +1,3 @@
>   # Locally computed
> -sha256  903f05c6b6e8dfc2ed7df19ec9b63733a5e38caeca1269cc9bb99d46659d8907  tvheadend-637844055c186e981495da711e4887806f656c98.tar.gz
> +sha256  11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad  tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz
>   sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index a50f74a074..27443307da 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -TVHEADEND_VERSION = 637844055c186e981495da711e4887806f656c98

  I don't know what happened on your end, but this is not the version we 
currently have, and AFAICS we never had this version...

  Regards,
  Arnout

> +TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6
>   TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
>   TVHEADEND_LICENSE = GPL-3.0+
>   TVHEADEND_LICENSE_FILES = LICENSE.md
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

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 49b102cf8d..db06af53b7 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  903f05c6b6e8dfc2ed7df19ec9b63733a5e38caeca1269cc9bb99d46659d8907  tvheadend-637844055c186e981495da711e4887806f656c98.tar.gz
+sha256  11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad  tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index a50f74a074..27443307da 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 637844055c186e981495da711e4887806f656c98
+TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Thomas Petazzoni]

On Sun, 28 Mar 2021 10:22:11 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Upstream removed x11 dependency from vaapi support:
> https://github.com/tvheadend/tvheadend/commit/ecd05a21de3075466476df97cf37ffd42c787e58
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/tvheadend/tvheadend.hash | 2 +-
>  package/tvheadend/tvheadend.mk   | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Bernd Kuhls]

Upstream removed x11 dependency from vaapi support:
https://github.com/tvheadend/tvheadend/commit/ecd05a21de3075466476df97cf37ffd42c787e58

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

diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index b987a735eb..1c896df140 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  b5e58601da7af383c2c7f27016417a478be0d302a4a8a00ec87fc8bdacc56ef1  tvheadend-febcf9818d7c37fec8a98d424934edcb3243d5e4.tar.gz
+sha256  fc734c36c98aa1535172621c3b6fcac9f1d253f850abc50d01b771937bfd2a76  tvheadend-dbaa0f850394af8ab845df802f5f781ac0218ec4.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index e19763e186..114142bfa9 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = febcf9818d7c37fec8a98d424934edcb3243d5e4
+TVHEADEND_VERSION = dbaa0f850394af8ab845df802f5f781ac0218ec4
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -29,7 +29,7 @@ endif
 ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y)
 TVHEADEND_CONF_OPTS += --enable-libav --enable-libx264
 TVHEADEND_DEPENDENCIES += ffmpeg x264
-ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_XORG7),yy)
+ifeq ($(BR2_PACKAGE_LIBVA),y)
 TVHEADEND_CONF_OPTS += --enable-vaapi
 TVHEADEND_DEPENDENCIES += libva
 else
-- 
2.29.2

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

[Thomas Petazzoni]

On Sun, 20 Sep 2020 09:22:08 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> 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(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Bernd Kuhls]

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 83b61ec5ae..d4dbc40067 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  b44a09c6579ee7ce7e4b490bd8b7d6d22daed70ccd6571aad222b8c73ffaeeda  tvheadend-51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e.tar.gz
+sha256  28cae1960135f9485907a5bea857963d5625fc374371d12320353f824ce70a06  tvheadend-6b8f014c39703640a1fe8af9c2b7663588ed2b56.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b21ab66c9e..de1de4af86 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e
+TVHEADEND_VERSION = 6b8f014c39703640a1fe8af9c2b7663588ed2b56
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.27.0

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

[Yann E. MORIN]

Bernd, All,

On 2020-06-14 12:52 +0200, Bernd Kuhls spake thusly:
> Reformatted hashes.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/tvheadend/tvheadend.hash | 4 ++--
>  package/tvheadend/tvheadend.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
> index 92dc921825..83b61ec5ae 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13  tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz
> -sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
> +sha256  b44a09c6579ee7ce7e4b490bd8b7d6d22daed70ccd6571aad222b8c73ffaeeda  tvheadend-51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e.tar.gz
> +sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index df7fd7fd9c..b21ab66c9e 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5
> +TVHEADEND_VERSION = 51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e
>  TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
>  TVHEADEND_LICENSE = GPL-3.0+
>  TVHEADEND_LICENSE_FILES = LICENSE.md
> -- 
> 2.26.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

[Bernd Kuhls]

Reformatted hashes.

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

diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 92dc921825..83b61ec5ae 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13  tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz
-sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
+sha256  b44a09c6579ee7ce7e4b490bd8b7d6d22daed70ccd6571aad222b8c73ffaeeda  tvheadend-51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e.tar.gz
+sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index df7fd7fd9c..b21ab66c9e 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5
+TVHEADEND_VERSION = 51a4c5bec7b6fc69dab7b8d559f9b1b881f0eb8e
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.26.2

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

It would be great if you could write a short summary of the changes for
such git bumps.

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

[Bernd Kuhls]

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 3bda417fb8..92dc921825 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 831ffec13240a93b63d74d508a416091b67f0d54f3596775a698c4ded4781ec4  tvheadend-6540ff23747499bfa28ba04cc76347a9209f4a1e.tar.gz
+sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13  tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index df88cdc31d..df7fd7fd9c 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 6540ff23747499bfa28ba04cc76347a9209f4a1e
+TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.20.1

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

[Thomas Petazzoni]

On Mon, 21 Oct 2019 19:14:54 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Rebased patch.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> I know this is the third bump in less than a week but several bugs were
> fixed upstream: https://github.com/tvheadend/tvheadend/commits/master
> 
> Also using a version tag is not an option, the newest tag 4.2.8 dates
> back to Jan 2019 and is on the 4.2 branch which, at time of writing,
> is 1843 commits behind the master branch, so imho no option.

Perhaps you could ask upstream to make proper releases/tags ?

Anyway, I've applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Bernd Kuhls]

Rebased patch.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
I know this is the third bump in less than a week but several bugs were
fixed upstream: https://github.com/tvheadend/tvheadend/commits/master

Also using a version tag is not an option, the newest tag 4.2.8 dates
back to Jan 2019 and is on the 4.2 branch which, at time of writing,
is 1843 commits behind the master branch, so imho no option.

 package/tvheadend/0001-no-check_config.patch | 2 +-
 package/tvheadend/tvheadend.hash             | 2 +-
 package/tvheadend/tvheadend.mk               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch
index 361ebcd41c..9261e5fff6 100644
--- a/package/tvheadend/0001-no-check_config.patch
+++ b/package/tvheadend/0001-no-check_config.patch
@@ -12,7 +12,7 @@ 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
-@@ -566,7 +566,7 @@
+@@ -708,7 +708,7 @@
  	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 5202ac8cd9..3bda417fb8 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 9c7888ec3754e20a728dcc06e69c8fa53fd085879ee5191bbcf35105f82cc1d2  tvheadend-6fbb30d039c763268b3e9017e062b0c9ec6bebeb.tar.gz
+sha256 831ffec13240a93b63d74d508a416091b67f0d54f3596775a698c4ded4781ec4  tvheadend-6540ff23747499bfa28ba04cc76347a9209f4a1e.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 4ad6317ff1..df88cdc31d 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 6fbb30d039c763268b3e9017e062b0c9ec6bebeb
+TVHEADEND_VERSION = 6540ff23747499bfa28ba04cc76347a9209f4a1e
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.20.1

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

[Bernd Kuhls]

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 ea24aec1cb..8928a42dd0 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 6a7703fbbe553a2d9f87acafc01162d81f78c6e427b8ab9c83242e1677248582  tvheadend-8f1de1621d78c91431238176bf4f6290870a031a.tar.gz
+sha256 313267b2e2752e5a150e225ec735e7cb9e9af8bb7e9bd05391262f0df01d1437  tvheadend-baf746bc1d420e7d628994922df0ddcb665f698f.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 61732a203c..377c224192 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 8f1de1621d78c91431238176bf4f6290870a031a
+TVHEADEND_VERSION = baf746bc1d420e7d628994922df0ddcb665f698f
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.20.1

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

[Bernd Kuhls]

Removed patch which was applied upstream.
Added patch to fix uClibc build error.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...ude-stdio.h-before-tvheadend-headers.patch | 63 +++++++++++++++++++
 ...pie-linking-according-to-disable-pie.patch | 34 ----------
 package/tvheadend/tvheadend.hash              |  2 +-
 package/tvheadend/tvheadend.mk                |  2 +-
 4 files changed, 65 insertions(+), 36 deletions(-)
 create mode 100644 package/tvheadend/0002-Include-stdio.h-before-tvheadend-headers.patch
 delete mode 100644 package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch

diff --git a/package/tvheadend/0002-Include-stdio.h-before-tvheadend-headers.patch b/package/tvheadend/0002-Include-stdio.h-before-tvheadend-headers.patch
new file mode 100644
index 0000000000..5c111ad161
--- /dev/null
+++ b/package/tvheadend/0002-Include-stdio.h-before-tvheadend-headers.patch
@@ -0,0 +1,63 @@
+From 5387b1b8decc1767a200c7fd860472225a10878d Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 1 Jul 2019 22:08:47 +0200
+Subject: [PATCH] Include stdio.h before tvheadend headers
+
+Fixes build error with uClibc: https://www.tvheadend.org/issues/5667
+
+Patch sent upstream:
+https://github.com/tvheadend/tvheadend/pull/1283
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/main.c       | 2 +-
+ src/tvh_locale.c | 1 +
+ src/tvhlog.c     | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 0e3bb4ab0..feb8e3025 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -16,10 +16,10 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <stdio.h>
+ #include <tvh_thread.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-#include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/tvh_locale.c b/src/tvh_locale.c
+index a7c5150f5..7d1420e99 100644
+--- a/src/tvh_locale.c
++++ b/src/tvh_locale.c
+@@ -16,6 +16,7 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <stdio.h>
+ #include "tvh_thread.h"
+ #include "tvh_locale.h"
+ #include "tvh_string.h"
+diff --git a/src/tvhlog.c b/src/tvhlog.c
+index 156b2110b..5e025cec4 100644
+--- a/src/tvhlog.c
++++ b/src/tvhlog.c
+@@ -16,9 +16,9 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <stdio.h>
+ #include "tvhlog.h"
+ #include <string.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-- 
+2.20.1
+
diff --git a/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch b/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch
deleted file mode 100644
index 385c94b36b..0000000000
--- a/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5cbf08213222cb507d365e6cbda87277f0b8f31e Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@micronovasrl.com>
-Date: Fri, 14 Jun 2019 14:25:08 +0200
-Subject: [PATCH] Makefile: fix -pie linking according to --disable-pie
-
-Only compilation follows './configure --disable-pie', linking instead
-doesn't, because '-pie' flag is passed to LDFLAGS uncoditionally.
-
-So add '-pie' flag only if CONFIG_PIE=yes.
-
-Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 41783b546..4e5a947a3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,10 @@ LDFLAGS += -ldl -lm
- else
- LDFLAGS += -ldl -lpthread -lm
- endif
--LDFLAGS += -pie -Wl,-z,now
-+ifeq ($(CONFIG_PIE),yes)
-+LDFLAGS += -pie
-+endif
-+LDFLAGS += -Wl,-z,now
- ifeq ($(CONFIG_LIBICONV),yes)
- LDFLAGS += -liconv
- endif
--- 
-2.17.1
-
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 43178b874a..243b6a1bdc 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 92c5f2cdda085b81fc50025afeb3ece74f60fae2b26f40a7dd07e227b0db2d9f  tvheadend-17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead.tar.gz
+sha256 6efa0b62f004829f91243939181ddb08d2f7da05105e2b2305a15ce512ba3de3  tvheadend-dcc50db45b322da22241c01807643160c16ccfc2.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b192a33d4a..1f4de5082c 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead
+TVHEADEND_VERSION = dcc50db45b322da22241c01807643160c16ccfc2
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.20.1

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

[Thomas Petazzoni]

Hello,

On Sat, 28 Jul 2018 10:24:45 +0200, Bernd Kuhls wrote:
> Removed patch 0002 after upstream commit:
> https://github.com/tvheadend/tvheadend/commit/e26ce3390a5ca88f3fcee8a7fa0e4bb1b078e538
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...-configure-check-for-strlcat-strlcpy.patch | 97 -------------------
>  package/tvheadend/tvheadend.hash              |  2 +-
>  package/tvheadend/tvheadend.mk                |  2 +-
>  3 files changed, 2 insertions(+), 99 deletions(-)
>  delete mode 100644 package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Bernd Kuhls]

Removed patch 0002 after upstream commit:
https://github.com/tvheadend/tvheadend/commit/e26ce3390a5ca88f3fcee8a7fa0e4bb1b078e538

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...-configure-check-for-strlcat-strlcpy.patch | 97 -------------------
 package/tvheadend/tvheadend.hash              |  2 +-
 package/tvheadend/tvheadend.mk                |  2 +-
 3 files changed, 2 insertions(+), 99 deletions(-)
 delete mode 100644 package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch

diff --git a/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch b/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
deleted file mode 100644
index 71c01e2f48..0000000000
--- a/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 1f879e4b930fef71f030e5b6e5fae359f27d1aec Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 23 Jun 2018 20:47:26 +0200
-Subject: [PATCH] configure: check for strlcat & strlcpy
-
-Building tvheadend with uclibc and musl fails:
-
-src/tvh_string.h:50:22: error: static declaration of 'strlcpy' follows non-static declaration
- static inline size_t strlcpy(char *dst, const char *src, size_t size)
-
-src/tvh_string.h:61:22: error: static declaration of 'strlcat' follows non-static declaration
- static inline size_t strlcat(char *dst, const char *src, size_t count)
-
-because they provide strlcat & strlcpy:
-https://sourceware.org/glibc/wiki/strlcpy
-
-This patch adds configure checks and makes the implementation in
-tvh_string.h optional, the configure log looks like this:
-
-glibc
-  checking for cc strlcat ...                       fail
-  checking for cc strlcpy ...                       fail
-
-musl
-  checking for cc strlcat ...                       ok
-  checking for cc strlcpy ...                       ok
-
-uclibc
-  checking for cc strlcat ...                       ok
-  checking for cc strlcpy ...                       ok
-
-Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1133
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure        | 14 ++++++++++++++
- src/tvh_string.h |  4 ++++
- 2 files changed, 18 insertions(+)
-
-diff --git a/configure b/configure
-index 0857a1958..b183d02b3 100755
---- a/configure
-+++ b/configure
-@@ -159,6 +159,20 @@ else
-   COMPILER=gcc
- fi
- 
-+check_cc_snippet strlcat '#include <string.h>
-+int test(int argc, char **argv) {
-+  char dst[10];
-+  strlcat("test", dst, sizeof(dst));
-+  return 0;
-+}'
-+
-+check_cc_snippet strlcpy '#include <string.h>
-+int test(int argc, char **argv) {
-+  char dst[10];
-+  strlcpy("test", dst, sizeof(dst));
-+  return 0;
-+}'
-+
- check_cc_snippet getloadavg '#include <stdlib.h>
- void test() { getloadavg(NULL,0); }'
- 
-diff --git a/src/tvh_string.h b/src/tvh_string.h
-index 87d8c3320..13ef2f308 100644
---- a/src/tvh_string.h
-+++ b/src/tvh_string.h
-@@ -47,6 +47,7 @@ static inline const char *tvh_strbegins(const char *s1, const char *s2)
-   return s1;
- }
- 
-+#ifndef ENABLE_STRLCPY
- static inline size_t strlcpy(char *dst, const char *src, size_t size)
- {
-   size_t ret = strlen(src);
-@@ -57,7 +58,9 @@ static inline size_t strlcpy(char *dst, const char *src, size_t size)
-   }
-   return ret;
- }
-+#endif
- 
-+#ifndef ENABLE_STRLCAT
- static inline size_t strlcat(char *dst, const char *src, size_t count)
- {
-   size_t dlen = strlen(dst);
-@@ -72,6 +75,7 @@ static inline size_t strlcat(char *dst, const char *src, size_t count)
-   dst[len] = '\0';
-   return res;
- }
-+#endif
- 
- #define tvh_strlcatf(buf, size, ptr, fmt...) \
-   do { int __r = snprintf((buf) + ptr, (size) - ptr, fmt); \
--- 
-2.17.1
-
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 06820d6193..ce275f132f 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 f12ad165d5abd464fe38c358b385eb030ae4daa01b940c348525d5bfc876e514  tvheadend-66d6161c563181e5a572337ab3509a835c5a57e2.tar.gz
+sha256 3389e857651665cc1fe96e624ffe12ad1ec28f31d396f0579fcaa47536fb6400  tvheadend-9b9ee6859be90fedb5d43ad1d770dfcdb8b1caf4.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 8e06165e3b..4c9cda4d9a 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 66d6161c563181e5a572337ab3509a835c5a57e2
+TVHEADEND_VERSION = 9b9ee6859be90fedb5d43ad1d770dfcdb8b1caf4
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.18.0

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

[Thomas Petazzoni]

Hello,

On Sat, 23 Jun 2018 20:55:44 +0200, Bernd Kuhls wrote:
> Removed patch 0002, applied upstream:
> https://github.com/tvheadend/tvheadend/commit/068e5f921ddc22e648ebe006e515baf3e1ea12d1
> 
> Added patch to fix musl & uclibc build.
> 
> Renamed option dvbcsa to tvhcsa.
> 
> Upstream removed the dvbcsa configure option with this commit:
> https://github.com/tvheadend/tvheadend/commit/4e7f837c7055f4cb173164ca31af139e0a7858a5#diff-e2d5a00791bce9a01f99bc6fd613a39d
> 
> and moved the optional dvbcsa support inside the tvhcsa option block:
> https://github.com/tvheadend/tvheadend/blob/c76c7e0604977305498221f83c049d6d4fc715ed/configure#L645
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...-configure-check-for-strlcat-strlcpy.patch | 97 +++++++++++++++++++
>  ...02-sbuf-fix-uclibc-compilation-error.patch | 33 -------
>  package/tvheadend/tvheadend.hash              |  2 +-
>  package/tvheadend/tvheadend.mk                |  6 +-
>  4 files changed, 101 insertions(+), 37 deletions(-)
>  create mode 100644 package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
>  delete mode 100644 package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Bernd Kuhls]

Removed patch 0002, applied upstream:
https://github.com/tvheadend/tvheadend/commit/068e5f921ddc22e648ebe006e515baf3e1ea12d1

Added patch to fix musl & uclibc build.

Renamed option dvbcsa to tvhcsa.

Upstream removed the dvbcsa configure option with this commit:
https://github.com/tvheadend/tvheadend/commit/4e7f837c7055f4cb173164ca31af139e0a7858a5#diff-e2d5a00791bce9a01f99bc6fd613a39d

and moved the optional dvbcsa support inside the tvhcsa option block:
https://github.com/tvheadend/tvheadend/blob/c76c7e0604977305498221f83c049d6d4fc715ed/configure#L645

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...-configure-check-for-strlcat-strlcpy.patch | 97 +++++++++++++++++++
 ...02-sbuf-fix-uclibc-compilation-error.patch | 33 -------
 package/tvheadend/tvheadend.hash              |  2 +-
 package/tvheadend/tvheadend.mk                |  6 +-
 4 files changed, 101 insertions(+), 37 deletions(-)
 create mode 100644 package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
 delete mode 100644 package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch

diff --git a/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch b/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
new file mode 100644
index 0000000000..71c01e2f48
--- /dev/null
+++ b/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch
@@ -0,0 +1,97 @@
+From 1f879e4b930fef71f030e5b6e5fae359f27d1aec Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 23 Jun 2018 20:47:26 +0200
+Subject: [PATCH] configure: check for strlcat & strlcpy
+
+Building tvheadend with uclibc and musl fails:
+
+src/tvh_string.h:50:22: error: static declaration of 'strlcpy' follows non-static declaration
+ static inline size_t strlcpy(char *dst, const char *src, size_t size)
+
+src/tvh_string.h:61:22: error: static declaration of 'strlcat' follows non-static declaration
+ static inline size_t strlcat(char *dst, const char *src, size_t count)
+
+because they provide strlcat & strlcpy:
+https://sourceware.org/glibc/wiki/strlcpy
+
+This patch adds configure checks and makes the implementation in
+tvh_string.h optional, the configure log looks like this:
+
+glibc
+  checking for cc strlcat ...                       fail
+  checking for cc strlcpy ...                       fail
+
+musl
+  checking for cc strlcat ...                       ok
+  checking for cc strlcpy ...                       ok
+
+uclibc
+  checking for cc strlcat ...                       ok
+  checking for cc strlcpy ...                       ok
+
+Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1133
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure        | 14 ++++++++++++++
+ src/tvh_string.h |  4 ++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/configure b/configure
+index 0857a1958..b183d02b3 100755
+--- a/configure
++++ b/configure
+@@ -159,6 +159,20 @@ else
+   COMPILER=gcc
+ fi
+ 
++check_cc_snippet strlcat '#include <string.h>
++int test(int argc, char **argv) {
++  char dst[10];
++  strlcat("test", dst, sizeof(dst));
++  return 0;
++}'
++
++check_cc_snippet strlcpy '#include <string.h>
++int test(int argc, char **argv) {
++  char dst[10];
++  strlcpy("test", dst, sizeof(dst));
++  return 0;
++}'
++
+ check_cc_snippet getloadavg '#include <stdlib.h>
+ void test() { getloadavg(NULL,0); }'
+ 
+diff --git a/src/tvh_string.h b/src/tvh_string.h
+index 87d8c3320..13ef2f308 100644
+--- a/src/tvh_string.h
++++ b/src/tvh_string.h
+@@ -47,6 +47,7 @@ static inline const char *tvh_strbegins(const char *s1, const char *s2)
+   return s1;
+ }
+ 
++#ifndef ENABLE_STRLCPY
+ static inline size_t strlcpy(char *dst, const char *src, size_t size)
+ {
+   size_t ret = strlen(src);
+@@ -57,7 +58,9 @@ static inline size_t strlcpy(char *dst, const char *src, size_t size)
+   }
+   return ret;
+ }
++#endif
+ 
++#ifndef ENABLE_STRLCAT
+ static inline size_t strlcat(char *dst, const char *src, size_t count)
+ {
+   size_t dlen = strlen(dst);
+@@ -72,6 +75,7 @@ static inline size_t strlcat(char *dst, const char *src, size_t count)
+   dst[len] = '\0';
+   return res;
+ }
++#endif
+ 
+ #define tvh_strlcatf(buf, size, ptr, fmt...) \
+   do { int __r = snprintf((buf) + ptr, (size) - ptr, fmt); \
+-- 
+2.17.1
+
diff --git a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch b/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
deleted file mode 100644
index deed9f98f7..0000000000
--- a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b16ad4d258409fbd6acf843d62a7a84f621e3b70 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Mon, 18 Dec 2017 20:52:06 +0100
-Subject: [PATCH] sbuf: fix uclibc compilation error
-
-Fixes build error
-
-tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3/src/sbuf.h:77:1:
- error: unknown type name 'ssize_t'; did you mean 'size_t'?
- ssize_t sbuf_read(sbuf_t *sb, int fd);
-
-Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1062
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/sbuf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/sbuf.h b/src/sbuf.h
-index 78aa546b3..d5aa53042 100644
---- a/src/sbuf.h
-+++ b/src/sbuf.h
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <stdint.h>
-+#include <unistd.h>
- 
- /**
-  * Simple dynamically growing buffer
--- 
-2.11.0
-
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 4e890a8272..06820d6193 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 32f96937a3ffa72b5bdbfde9a5f9f9535f88e94e44864d4c8c6a152985c16569  tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3.tar.gz
+sha256 f12ad165d5abd464fe38c358b385eb030ae4daa01b940c348525d5bfc876e514  tvheadend-66d6161c563181e5a572337ab3509a835c5a57e2.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 45ea7bfc28..8e06165e3b 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = e06ffd87beff16103c47d6fa542df2374fca6fd3
+TVHEADEND_VERSION = 66d6161c563181e5a572337ab3509a835c5a57e2
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -65,9 +65,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
 TVHEADEND_DEPENDENCIES += libdvbcsa
-TVHEADEND_CONF_OPTS += --enable-dvbcsa
+TVHEADEND_CONF_OPTS += --enable-tvhcsa
 else
-TVHEADEND_CONF_OPTS += --disable-dvbcsa
+TVHEADEND_CONF_OPTS += --disable-tvhcsa
 endif
 
 ifeq ($(BR2_PACKAGE_LIBHDHOMERUN),y)
-- 
2.17.1

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

[Bernd Kuhls]

Removed patch 0002, applied upstream:
https://github.com/tvheadend/tvheadend/commit/068e5f921ddc22e648ebe006e515baf3e1ea12d1

Renamed option dvbcsa to tvhcsa.

Upstream removed the dvbcsa configure option with this commit:
https://github.com/tvheadend/tvheadend/commit/4e7f837c7055f4cb173164ca31af139e0a7858a5#diff-e2d5a00791bce9a01f99bc6fd613a39d

and moved the optional dvbcsa support inside the tvhcsa option block:
https://github.com/tvheadend/tvheadend/blob/c76c7e0604977305498221f83c049d6d4fc715ed/configure#L645

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0002-sbuf-fix-uclibc-compilation-error.patch   | 33 ----------------------
 package/tvheadend/tvheadend.hash                   |  2 +-
 package/tvheadend/tvheadend.mk                     |  6 ++--
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch

diff --git a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch b/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
deleted file mode 100644
index deed9f98f7..0000000000
--- a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b16ad4d258409fbd6acf843d62a7a84f621e3b70 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Mon, 18 Dec 2017 20:52:06 +0100
-Subject: [PATCH] sbuf: fix uclibc compilation error
-
-Fixes build error
-
-tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3/src/sbuf.h:77:1:
- error: unknown type name 'ssize_t'; did you mean 'size_t'?
- ssize_t sbuf_read(sbuf_t *sb, int fd);
-
-Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1062
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/sbuf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/sbuf.h b/src/sbuf.h
-index 78aa546b3..d5aa53042 100644
---- a/src/sbuf.h
-+++ b/src/sbuf.h
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <stdint.h>
-+#include <unistd.h>
- 
- /**
-  * Simple dynamically growing buffer
--- 
-2.11.0
-
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 4e890a8272..349fdf1e61 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 32f96937a3ffa72b5bdbfde9a5f9f9535f88e94e44864d4c8c6a152985c16569  tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3.tar.gz
+sha256 801a433557dabd7e4f97724ea427ad20b05547276b57dd5cbca74935ae1476f1  tvheadend-4fe0af0e8d9e47b1bbae5599bea09a772325a9f9.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 45ea7bfc28..d64186fbaf 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = e06ffd87beff16103c47d6fa542df2374fca6fd3
+TVHEADEND_VERSION = 4fe0af0e8d9e47b1bbae5599bea09a772325a9f9
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -65,9 +65,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
 TVHEADEND_DEPENDENCIES += libdvbcsa
-TVHEADEND_CONF_OPTS += --enable-dvbcsa
+TVHEADEND_CONF_OPTS += --enable-tvhcsa
 else
-TVHEADEND_CONF_OPTS += --disable-dvbcsa
+TVHEADEND_CONF_OPTS += --disable-tvhcsa
 endif
 
 ifeq ($(BR2_PACKAGE_LIBHDHOMERUN),y)
-- 
2.14.2

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

[Thomas Petazzoni]

Hello,

On Sat, 21 Oct 2017 20:02:51 +0200, Bernd Kuhls wrote:
> 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(-)

Applied to master, thanks.

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

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

[Bernd Kuhls]

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 515c36ab99..f9fd385e9b 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 d61a6e45d0aef2370885be4c58ed95eaa36b2ba1d8fbb75f7759ddc08e020487  tvheadend-0d1cd06fb237504123a08de84afc25d73fa14ba8.tar.gz
+sha256 7ff9f6a583d7e288c69eb8bfbd628e630e85252e04a8394666cc3c9f9b785df3  tvheadend-a234e2ff6d140e6ffceb7057bf18a8fdd927a5ac.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 3eb9161a46..88f9869fa6 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 0d1cd06fb237504123a08de84afc25d73fa14ba8
+TVHEADEND_VERSION = a234e2ff6d140e6ffceb7057bf18a8fdd927a5ac
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.11.0

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > It seems github now sometimes provides slightly changed tarballs which
 > produce a different sha256 hash than before, this is the case for
 > tvheadend. Instead of fixing the hash lets bump to current HEAD and
 > hope that the new hash will be valid for a longer period of time ;)

 > Fixes
 > http://autobuild.buildroot.net/results/59a/59ad7940dcd498cd0aaec26c8497b21e64379a6f/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

[Bernd Kuhls]

It seems github now sometimes provides slightly changed tarballs which
produce a different sha256 hash than before, this is the case for
tvheadend. Instead of fixing the hash lets bump to current HEAD and
hope that the new hash will be valid for a longer period of time ;)

Fixes
http://autobuild.buildroot.net/results/59a/59ad7940dcd498cd0aaec26c8497b21e64379a6f/

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 a33b0a5e5f..515c36ab99 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 00f67fbf9d8cfea7da90f469b36a8205fb9a38727c4cc5022f4ee5fd322459d3  tvheadend-303f418e1ac2bb3078f7a974b69f04ab6a56c636.tar.gz
+sha256 d61a6e45d0aef2370885be4c58ed95eaa36b2ba1d8fbb75f7759ddc08e020487  tvheadend-0d1cd06fb237504123a08de84afc25d73fa14ba8.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index cf8bee9cee..3eb9161a46 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 303f418e1ac2bb3078f7a974b69f04ab6a56c636
+TVHEADEND_VERSION = 0d1cd06fb237504123a08de84afc25d73fa14ba8
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.11.0

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

[Bernd Kuhls]

Am Wed, 06 Sep 2017 18:35:55 +0200 schrieb Yann E. MORIN:

> But yes, the patch does more than one thing at a time, so should be
> split.

Hi,

ok, sent a new approach which makes transcoding optional:
http://patchwork.ozlabs.org/project/buildroot/list/?series=1877

Regards, Bernd

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

[Yann E. MORIN]

On 2017-09-06 08:55 +0200, Thomas Petazzoni spake thusly:
> Hello,
> 
> On Tue, 5 Sep 2017 22:16:38 +0200, Yann E. MORIN wrote:
> > Thomas, All,
> > 
> > On 2017-09-05 22:13 +0200, Thomas Petazzoni spake thusly:
> > > On Mon,  4 Sep 2017 20:57:38 +0200, Bernd Kuhls wrote:  
> > > > Add optional dependencies to
> > > > 
> > > > - libva
> > > >   ffmpeg depends on libva, libva depends on xorg, so no need to add them
> > > >   to _DEPENDENCIES  
> > > 
> > > I don't see ffmpeg depending on libva, where do you see that ?  
> > 
> > Yet it does, see line 243. ;-)
> 
> Well, it will depend on libva if it's enabled. But I don't see anything
> in tvheadend or ffmpeg that forces libva to be enabled.

No, but the commit log says it is adding _optional_ dependency to libva.

So indeed nothing forces libva to be on, but if it is, then support is
explicitly enabled, otherwise it is explicitly disabled.

That's how I understand the patch.

But yes, the patch does more than one thing at a time, so should be
split.

Regards,
Yann E. MORIN.

> Perhaps I'm missing something obvious here.
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

[Thomas Petazzoni]

Hello,

On Tue, 5 Sep 2017 22:16:38 +0200, Yann E. MORIN wrote:
> Thomas, All,
> 
> On 2017-09-05 22:13 +0200, Thomas Petazzoni spake thusly:
> > On Mon,  4 Sep 2017 20:57:38 +0200, Bernd Kuhls wrote:  
> > > Add optional dependencies to
> > > 
> > > - libva
> > >   ffmpeg depends on libva, libva depends on xorg, so no need to add them
> > >   to _DEPENDENCIES  
> > 
> > I don't see ffmpeg depending on libva, where do you see that ?  
> 
> Yet it does, see line 243. ;-)

Well, it will depend on libva if it's enabled. But I don't see anything
in tvheadend or ffmpeg that forces libva to be enabled.

Perhaps I'm missing something obvious here.

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

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

[Yann E. MORIN]

Thomas, All,

On 2017-09-05 22:13 +0200, Thomas Petazzoni spake thusly:
> On Mon,  4 Sep 2017 20:57:38 +0200, Bernd Kuhls wrote:
> > Add optional dependencies to
> > 
> > - libva
> >   ffmpeg depends on libva, libva depends on xorg, so no need to add them
> >   to _DEPENDENCIES
> 
> I don't see ffmpeg depending on libva, where do you see that ?

Yet it does, see line 243. ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

[Thomas Petazzoni]

Hello,

On Mon,  4 Sep 2017 20:57:38 +0200, Bernd Kuhls wrote:
> Add optional dependencies to
> 
> - libva
>   ffmpeg depends on libva, libva depends on xorg, so no need to add them
>   to _DEPENDENCIES

I don't see ffmpeg depending on libva, where do you see that ?

> - libtheora, libvorbis, libvpx, opus, x264, x265

You're doing more in this commit: you're removing libvpx as a mandatory
dependency, as well as x264.

It would be good to have a more descriptive commit log when the bump
isn't trivial.

Thanks,

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

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

[Bernd Kuhls]

Add optional dependencies to

- libva
  ffmpeg depends on libva, libva depends on xorg, so no need to add them
  to _DEPENDENCIES
- libtheora, libvorbis, libvpx, opus, x264, x265

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/tvheadend/Config.in      |  2 --
 package/tvheadend/tvheadend.hash |  2 +-
 package/tvheadend/tvheadend.mk   | 51 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index fc39d6f48..67a4b1419 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -12,8 +12,6 @@ config BR2_PACKAGE_TVHEADEND
 	select BR2_PACKAGE_DTV_SCAN_TABLES
 	select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG && !BR2_bfin # libvpx
-	select BR2_PACKAGE_X264 if BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_OPENSSL
 	help
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 3154b3276..a69f8590c 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 1994e379c798b118243e70f7fa38064a9b288d6e38b9ced0e8ad465f5d2e8fd9  tvheadend-54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732.tar.gz
+sha256 5265960bb5569d5d978c434042824484b946945d6ca3b6f530f14f8b3ff2fc02  tvheadend-aa052acbe8cc3873bf9ed2c64dbc953124bcda16.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 6c0eb6375..e989c0d56 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732
+TVHEADEND_VERSION = aa052acbe8cc3873bf9ed2c64dbc953124bcda16
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
@@ -29,8 +29,13 @@ endif
 ifeq ($(BR2_PACKAGE_FFMPEG),y)
 TVHEADEND_DEPENDENCIES += ffmpeg
 TVHEADEND_CONF_OPTS += --enable-libav
+ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_XORG7),yy)
+TVHEADEND_CONF_OPTS += --enable-vaapi
 else
-TVHEADEND_CONF_OPTS += --disable-libav
+TVHEADEND_CONF_OPTS += --disable-vaapi
+endif
+else
+TVHEADEND_CONF_OPTS += --disable-libav --disable-vaapi
 endif
 
 ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
@@ -57,6 +62,34 @@ TVHEADEND_DEPENDENCIES += liburiparser
 TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 
+ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
+TVHEADEND_CONF_OPTS += --enable-libtheora
+TVHEADEND_DEPENDENCIES += libtheora
+else
+TVHEADEND_CONF_OPTS += --disable-libtheora
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+TVHEADEND_CONF_OPTS += --enable-libvorbis
+TVHEADEND_DEPENDENCIES += libvorbis
+else
+TVHEADEND_CONF_OPTS += --disable-libvorbis
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVPX),y)
+TVHEADEND_CONF_OPTS += --enable-libvpx
+TVHEADEND_DEPENDENCIES += libvpx
+else
+TVHEADEND_CONF_OPTS += --disable-libvpx
+endif
+
+ifeq ($(BR2_PACKAGE_OPUS),y)
+TVHEADEND_DEPENDENCIES += opus
+TVHEADEND_CONF_OPTS += --enable-libopus
+else
+TVHEADEND_CONF_OPTS += --disable-libopus
+endif
+
 ifeq ($(BR2_PACKAGE_PCRE),y)
 TVHEADEND_DEPENDENCIES += pcre
 TVHEADEND_CONF_OPTS += --enable-pcre
@@ -64,6 +97,20 @@ else
 TVHEADEND_CONF_OPTS += --disable-pcre
 endif
 
+ifeq ($(BR2_PACKAGE_X264),y)
+TVHEADEND_CONF_OPTS += --enable-libx264
+TVHEADEND_DEPENDENCIES += x264
+else
+TVHEADEND_CONF_OPTS += --disable-libx264
+endif
+
+ifeq ($(BR2_PACKAGE_X265),y)
+TVHEADEND_CONF_OPTS += --enable-libx265
+TVHEADEND_DEPENDENCIES += x265
+else
+TVHEADEND_CONF_OPTS += --disable-libx265
+endif
+
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
 
 # The tvheadend build system expects the transponder data to be present inside
-- 
2.11.0

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

[Bernd Kuhls]

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 ca10dc38bf..d34dbf1f4e 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 71dd3d8efa32d592342ff6955cc2cd317f07e74d2d546977eb9bc45136dd5de6  tvheadend-50a370707aedf5c127e92bb517c378aa8ac04657.tar.gz
+sha256 ac3c088654864781f2b2a2797e3a8b03a1b2e86db731c08cb5f296a04069560d  tvheadend-e5f5a4278949afc96e26d6cd50cf968e0e92d7b6.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index a3afec8c03..42c6767f60 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 50a370707aedf5c127e92bb517c378aa8ac04657
+TVHEADEND_VERSION = e5f5a4278949afc96e26d6cd50cf968e0e92d7b6
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.11.0

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

[Thomas Petazzoni]

Hello,

On Wed,  1 Jun 2016 21:28:48 +0200, Bernd Kuhls wrote:
> 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(-)

Applied to master, thanks.

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

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

[Bernd Kuhls]

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 9406d08..0479971 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	50ada2f30387f9526e1ed453f778686b443e599841a73a031cdd543b65e7a502	tvheadend-cd9f07fb865e5700156546ee326fbaf42ee99cf8.tar.gz
+sha256	b6035c0eedfdcbec965116248471c23bed7f8b7f899e403d670495325002ba78	tvheadend-8e637f9f903f6d820f701a1461b144e67665c6fa.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 07577d0..516cbd3 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = cd9f07fb865e5700156546ee326fbaf42ee99cf8
+TVHEADEND_VERSION = 8e637f9f903f6d820f701a1461b144e67665c6fa
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.8.1

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes
 > http://autobuild.buildroot.net/results/4e4/4e403fa4aba6196ddc362cfe9c1e37743fa3cede/

 > and other atomic-related build errors by this upstream commit:
 > https://github.com/tvheadend/tvheadend/commit/f0472eebaa539c61e958432cded2b7cac41f758f

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/4e4/4e403fa4aba6196ddc362cfe9c1e37743fa3cede/

and other atomic-related build errors by this upstream commit:
https://github.com/tvheadend/tvheadend/commit/f0472eebaa539c61e958432cded2b7cac41f758f

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 5737c2f..14d0fb0 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	5e59b2659badfe921fc324162dbfbfb69da8fe7eac21478651287fd56784ab11	tvheadend-3927788bb71ad0041a00d0daa35fae1cb6355b55.tar.gz
+sha256	9f25c79247ba59a6eb9ff8b9843b2e6cbc2702fa339a0ed89d24beb9017066e3	tvheadend-7adea4a102475fbeb0267a9ab160e1e0644f11c2.tar.gz
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 40d8c6e..3398faf 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 3927788bb71ad0041a00d0daa35fae1cb6355b55
+TVHEADEND_VERSION = 7adea4a102475fbeb0267a9ab160e1e0644f11c2
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.7.0

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

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 20 Jun 2015 13:32:52 +0200, Bernd Kuhls wrote:
> host-gettext is needed since
> https://github.com/tvheadend/tvheadend/commit/bad281a9f5bbb8e7f968d400f8096908dfd798b9#diff-e2d5a00791bce9a01f99bc6fd613a39d
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/tvheadend/0001-no-check_config.patch |    4 ++--
>  package/tvheadend/tvheadend.mk               |    8 ++++++--
>  2 files changed, 8 insertions(+), 4 deletions(-)

Applied, thanks.

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

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

[Bernd Kuhls]

host-gettext is needed since
https://github.com/tvheadend/tvheadend/commit/bad281a9f5bbb8e7f968d400f8096908dfd798b9#diff-e2d5a00791bce9a01f99bc6fd613a39d

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

diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch
index b55cbfc..bc724db 100644
--- a/package/tvheadend/0001-no-check_config.patch
+++ b/package/tvheadend/0001-no-check_config.patch
@@ -16,8 +16,8 @@ diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvhe
  	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
--${PROG}: check_config $(OBJS) $(ALLDEPS)
-+${PROG}: $(OBJS) $(ALLDEPS)
+-${PROG}: check_config make_webui $(MO-FILES) $(OBJS)
++${PROG}: make_webui $(MO-FILES) $(OBJS)
  	$(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)
  
  # Object
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 2a0019e..7ad725b 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,11 +4,15 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 14f03b8efbc40b840eda8e203a6002d6c3f24250
+TVHEADEND_VERSION = 8d561f11d6e3678f801803d7c69cf32d5b915ec2
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-TVHEADEND_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) openssl
+TVHEADEND_DEPENDENCIES = \
+	host-gettext \
+	host-pkgconf \
+	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \
+	openssl
 
 ifeq ($(BR2_PACKAGE_AVAHI),y)
 TVHEADEND_DEPENDENCIES += avahi
-- 
1.7.10.4