From patchwork Mon Jul 1 20:18:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1125591 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45czGq0pLYz9s8m for ; Tue, 2 Jul 2019 06:18:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 18CB7876D8; Mon, 1 Jul 2019 20:18:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hyHZ3yChp-wo; Mon, 1 Jul 2019 20:18:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 34024875C7; Mon, 1 Jul 2019 20:18:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AE21F1BF362 for ; Mon, 1 Jul 2019 20:18:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A67C285A5D for ; Mon, 1 Jul 2019 20:18:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MtlM2iAOKYQo for ; Mon, 1 Jul 2019 20:18:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 839AC858C9 for ; Mon, 1 Jul 2019 20:18:41 +0000 (UTC) Received: from fwd04.aul.t-online.de (fwd04.aul.t-online.de [172.20.26.149]) by mailout05.t-online.de (Postfix) with SMTP id 3763D4238E45; Mon, 1 Jul 2019 22:18:39 +0200 (CEST) Received: from fli4l.lan.fli4l (Gvk77TZTQhFPAKS-tr39VZ47GE7NXtxdGHOVmSCLRxo37HRFNwoGvNBxvHKgjeGQ5a@[91.58.12.45]) by fwd04.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hi2l2-1O3Cts0; Mon, 1 Jul 2019 22:18:36 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:40618) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hi2l1-0000tL-0F; Mon, 01 Jul 2019 22:18:35 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 1 Jul 2019 22:18:33 +0200 Message-Id: <20190701201834.19994-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: Gvk77TZTQhFPAKS-tr39VZ47GE7NXtxdGHOVmSCLRxo37HRFNwoGvNBxvHKgjeGQ5a X-TOI-MSGID: fa4acaad-da14-4fef-b7c8-9e39c6ac11ca Subject: [Buildroot] [PATCH 1/1] package/tvheadend: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed patch which was applied upstream. Added patch to fix uClibc build error. Signed-off-by: Bernd Kuhls --- ...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 +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 +--- + 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 . + */ + ++#include + #include + #include + #include +-#include + #include + #include + #include +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 . + */ + ++#include + #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 . + */ + ++#include + #include "tvhlog.h" + #include +-#include + #include + #include + #include +-- +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 -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 ---- - 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