From 0846221426b1cefa9e569f1927bc6fed102acb36 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Feb 2022 19:48:36 +0100 Subject: [PATCH] package/tvheadend: bump version Removed patch which was applied upstream: https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 ------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch deleted file mode 100644 index c55d127d58..0000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Jan 2022 16:53:29 +0100 -Subject: [PATCH] configure: add execinfo option - -Add execinfo option to allow the user to disable the feature even if -execinfo.h is found on the system - -Signed-off-by: Fabrice Fontaine -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] ---- - configure | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 4dad024c4..c087502bf 100755 ---- a/configure -+++ b/configure -@@ -75,6 +75,7 @@ OPTIONS=( - "ddci:yes" - "cclang_threadsan:no" - "gperftools:no" -+ "execinfo:auto" - ) - - # -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then - # If we don't have libunwind then fallback to execinfo. - if ! enabled libunwind - then -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - - else -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - check_cc_option mmx - check_cc_option sse2 --- -2.33.0 - diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index db06af53b7..44ff745221 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb054..d2547b8746 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md