package/tvheadend: bump version
PATCH v2 1/1 package/tvheadend: bump version
Removed patch which was applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>
---
v2: bumped version after patch from v1 was committed upstream
...pie-linking-according-to-disable-pie.patch | 34 ------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch
package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 5cbf08213222cb507d365e6cbda87277f0b8f31e Mon Sep 17 00:00:00 2001 -From: Giulio Benetti <[email protected]> -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 <[email protected]> ---- - 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 -
package/tvheadend/tvheadend.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 92c5f2cdda085b81fc50025afeb3ece74f60fae2b26f40a7dd07e227b0db2d9f tvheadend-17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead.tar.gz +sha256 6a7703fbbe553a2d9f87acafc01162d81f78c6e427b8ab9c83242e1677248582 tvheadend-8f1de1621d78c91431238176bf4f6290870a031a.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md
package/tvheadend/tvheadend.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead +TVHEADEND_VERSION = 8f1de1621d78c91431238176bf4f6290870a031a TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md
Signature · 1 line
2.20.1
PATCH v2 1/1 package/tvheadend: bump version
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Removed patch which was applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>---
v2: bumped version after patch from v1 was committed upstream
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard