From patchwork Sat Nov 26 06:24:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 84224 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp383299qgi; Fri, 25 Nov 2016 22:50:05 -0800 (PST) X-Received: by 10.84.216.26 with SMTP id m26mr26014523pli.22.1480143005727; Fri, 25 Nov 2016 22:50:05 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s66si47828326pfg.201.2016.11.25.22.50.04; Fri, 25 Nov 2016 22:50:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EEC3471BCC; Sat, 26 Nov 2016 06:50:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id E6F496FEFE for ; Sat, 26 Nov 2016 06:24:41 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id e9so7319996pgc.1 for ; Fri, 25 Nov 2016 22:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ALJW96LCqL9xMG4Nl4RLJXCXJKLErvJP7DBSsNiJOHc=; b=F0qg4oyV94mveocm7l+tn6dwV/PwTAMtR0/qCDpYLG0YglzcvxzjxqLVBJuTKsc0XW VxqU2jT8Z8D/CuHPucqvS02XApainDIiTFvmmaKmoheqtrKyOIgkL7OQgfA1UmypvO1g CtYyGdGq+7I1vrOutOTP46sSzjOZ0GktF9II9bY5l5eFwHNfazfGAjdAoj4NLqtGumDS 6PlvGD7y3DTHuAlm8feiyp0UwwdHhBN3u3+AOxT70E6XHU75pO407xoBaBgxatAlEQJZ eYJKllAc7AvVnA7bqhYiwedDfLiCZw6/5v8W3FNbpCw74y64+mo2Ibm+GsK7K1XEfGw0 T4gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ALJW96LCqL9xMG4Nl4RLJXCXJKLErvJP7DBSsNiJOHc=; b=Z4d3YXc5NpOzKKFhYOQ8yjvHAImBwULz8/U3eTpTNl+BDaUOSW1TAFVfcktWKxRvzC EeQDV9F3lUzzWi3zrbdyXHoVt8uRos0Hyh/W5qQTghf4K/sMNbsw5RMS10SFXsaXsdZZ MxFej/64ZUMM8cycyCIXGjOEHWeITcQtnkyHoIIN+CGJdXDlrNOvDyL5uu2FMgYf5l9V HJmerFHZTx4R1VbdOn3rrMax7Rp71m7R1vS918BO7UxqvW1f+y0XG1OF2u/mwwiUYW4x uYuizsVlZ1c8xAngOPTtOPeOKSWiNU7aJX0ygtttFwoIBXLux9cMLK0s0JWPn3SFo5lV RMfA== X-Gm-Message-State: AKaTC03JQju+PhwHylIqoqFWpBZTLj+S2kfo1TO71sWSs1c8l+y2iP16ouURiy6rryS2GA== X-Received: by 10.98.150.206 with SMTP id s75mr11705748pfk.155.1480141482744; Fri, 25 Nov 2016 22:24:42 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id e11sm53946299pgp.10.2016.11.25.22.24.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2016 22:24:42 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 25 Nov 2016 22:24:33 -0800 Message-Id: <20161126062435.27569-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161126062435.27569-1-raj.khem@gmail.com> References: <20161126062435.27569-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH V2 2/4] tvheadend: Update to 4.0.9 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: openembedded-devel@lists.openembedded.org MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * Add missing build and runtime deps * add packageconfig for uriparser Signed-off-by: Khem Raj --- .../tvheadend/0001-Fix-checks-for-sse2-mmx.patch | 40 ++++++++++ ...efile-Ignore-warning-about-wrong-includes.patch | 31 ++++++++ ...end-specific-LD-CFLAGS-into-a-helper-vari.patch | 92 ---------------------- .../0001-disable-varargs-warning-on-clang.patch | 32 ++++++++ .../0001-dvr-Use-labs-instead-of-abs.patch | 37 +++++++++ ...verride-forced-overrdiing-og-CC-STRIP-and.patch | 40 ++++++++++ .../tvheadend/0002-fix-issues-with-gcc6.patch | 46 ----------- .../recipes-dvb/tvheadend/tvheadend_git.bb | 25 ++++-- 8 files changed, 197 insertions(+), 146 deletions(-) create mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Fix-checks-for-sse2-mmx.patch create mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Makefile-Ignore-warning-about-wrong-includes.patch delete mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch create mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-disable-varargs-warning-on-clang.patch create mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-dvr-Use-labs-instead-of-abs.patch create mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch delete mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch -- 2.10.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Fix-checks-for-sse2-mmx.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Fix-checks-for-sse2-mmx.patch new file mode 100644 index 0000000..3283a5b --- /dev/null +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Fix-checks-for-sse2-mmx.patch @@ -0,0 +1,40 @@ +From f0dab6d6fe4b0aae4394eee93be86e9747c6ed5c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Nov 2016 05:07:38 +0000 +Subject: [PATCH] Fix checks for sse2/mmx + +Just checking for cmdline options is not enough +its better to check for builtin defines to be +sure, clang does not error out on sse2 options on +arm e.g. and it ends up doing SSE2 stuff for arm +which is not desired + +Signed-off-by: Khem Raj +--- + configure | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 47d2cf2..4be000c 100755 +--- a/configure ++++ b/configure +@@ -118,8 +118,14 @@ fi + # Valiate compiler + check_cc || die 'No C compiler found' + check_cc_header execinfo +-check_cc_option mmx +-check_cc_option sse2 ++check_cc_snippet mmx '#ifndef __MMX__ ++error "MMX not supported" ++#endif ++' ++check_cc_snippet sse2 '#ifndef __SSE2__ ++error "SSE2 not supported" ++#endif ++' + + if check_cc ' + #if !defined(__clang__) +-- +1.9.1 + diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Makefile-Ignore-warning-about-wrong-includes.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Makefile-Ignore-warning-about-wrong-includes.patch new file mode 100644 index 0000000..248a5e6 --- /dev/null +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Makefile-Ignore-warning-about-wrong-includes.patch @@ -0,0 +1,31 @@ +From 7d672305c7ad2f716dfe1c487b525a1a92954d4a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Nov 2016 06:22:36 +0000 +Subject: [PATCH] Makefile: Ignore warning about wrong includes + +It happens on musl especially +usr/include/sys/poll.h:1:2: error: redirecting incorrect #include to [-Werror,-W#warnings] +| #warning redirecting incorrect #include to +| ^ +| In file included from src/avahi.c:48: + +Signed-off-by: Khem Raj +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index f41ef1a..cc7b249 100644 +--- a/Makefile ++++ b/Makefile +@@ -54,6 +54,7 @@ CFLAGS += -Wno-microsoft -Qunused-arguments -Wno-unused-function + CFLAGS += -Wno-unused-value -Wno-tautological-constant-out-of-range-compare + CFLAGS += -Wno-parentheses-equality -Wno-incompatible-pointer-types + CFLAGS += -Wno-error=varargs ++CFLAGS += -Wno-error=\#warnings + endif + + ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes) +-- +1.8.3.1 + diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch deleted file mode 100644 index 9dfcce0..0000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 2ee64b359464b48f751683faa5ded3ee8200fe90 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 21 Dec 2012 10:15:42 +0100 -Subject: [PATCH] Move tvheadend specific LD/CFLAGS into a helper variable to - avoid being overwritten - -Signed-off-by: Koen Kooi - -Upstream-Status: Inappropriate [OE specific] ---- - Makefile | 20 ++++++++++---------- - support/configure.inc | 8 ++++---- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/Makefile b/Makefile -index 8c6b293..daf5f14 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,12 +27,12 @@ PROG = ${BUILDDIR}/tvheadend - # Common compiler flags - # - --CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations --CFLAGS += -Wmissing-prototypes -fms-extensions --CFLAGS += -g -funsigned-char -O2 --CFLAGS += -D_FILE_OFFSET_BITS=64 --CFLAGS += -I${BUILDDIR} -I${CURDIR}/src -I${CURDIR} --LDFLAGS += -lrt -ldl -lpthread -lm -+TVH_CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations -+TVH_CFLAGS += -Wmissing-prototypes -fms-extensions -+TVH_CFLAGS += -g -funsigned-char -O2 -+TVH_CFLAGS += -D_FILE_OFFSET_BITS=64 -+TVH_CFLAGS += -I${BUILDDIR} -I${CURDIR}/src -I${CURDIR} -+TVH_LDFLAGS += -lrt -ldl -lpthread -lm - - # - # Other config -@@ -179,8 +179,8 @@ SRCS-${CONFIG_CWC} += src/ffdecsa/ffdecsa_interface.c \ - src/ffdecsa/ffdecsa_int.c - SRCS-${CONFIG_MMX} += src/ffdecsa/ffdecsa_mmx.c - SRCS-${CONFIG_SSE2} += src/ffdecsa/ffdecsa_sse2.c --${BUILDDIR}/src/ffdecsa/ffdecsa_mmx.o : CFLAGS += -mmmx --${BUILDDIR}/src/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2 -+${BUILDDIR}/src/ffdecsa/ffdecsa_mmx.o : TVH_CFLAGS += -mmmx -+${BUILDDIR}/src/ffdecsa/ffdecsa_sse2.o : TVH_CFLAGS += -msse2 - endif - - # File bundles -@@ -217,12 +217,12 @@ all: ${PROG} - - # Binary - ${PROG}: $(OBJS) $(ALLDEPS) -- $(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS) -+ $(CC) -o $@ $(OBJS) $(TVH_CFLAGS) $(TVH_LDFLAGS) $(CFLAGS) $(LDFLAGS) - - # Object - ${BUILDDIR}/%.o: %.c - @mkdir -p $(dir $@) -- $(CC) -MD -MP $(CFLAGS) -c -o $@ $(CURDIR)/$< -+ $(CC) -MD -MP $(TVH_CFLAGS) $(CFLAGS) -c -o $@ $(CURDIR)/$< - - # Add-on - ${BUILDDIR}/%.so: ${SRCS_EXTRA} -diff --git a/support/configure.inc b/support/configure.inc -index 0130880..332511e 100644 ---- a/support/configure.inc -+++ b/support/configure.inc -@@ -464,8 +464,8 @@ ifeq (\$(origin CC),default) - CC = ${CC} - endif - PYTHON ?= ${PYTHON} --CFLAGS += ${CFLAGS} --LDFLAGS += ${LDFLAGS} -+TVH_CFLAGS += ${CFLAGS} -+TVH_LDFLAGS += ${LDFLAGS} - prefix = ${prefix} - bindir = ${bindir} - mandir = ${mandir} -@@ -482,8 +482,8 @@ EOF - # Add package config - for pkg in ${PACKAGES[*]}; do - cat >>${CONFIG_MK} < +Date: Tue, 22 Nov 2016 05:22:32 +0000 +Subject: [PATCH] disable varargs warning on clang + +The issue is that 'len' is an unsigned char and we violate the promotion rules +for passing the value to va_start. + +passing an object that undergoes defau +lt argument promotion to 'va_start' has undefined behavior [-Wvarargs] +| va_start(ap, len); + +Signed-off-by: Khem Raj +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8c5e380..f41ef1a 100644 +--- a/Makefile ++++ b/Makefile +@@ -53,6 +53,7 @@ ifeq ($(COMPILER), clang) + CFLAGS += -Wno-microsoft -Qunused-arguments -Wno-unused-function + CFLAGS += -Wno-unused-value -Wno-tautological-constant-out-of-range-compare + CFLAGS += -Wno-parentheses-equality -Wno-incompatible-pointer-types ++CFLAGS += -Wno-error=varargs + endif + + ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes) +-- +1.9.1 + diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-dvr-Use-labs-instead-of-abs.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-dvr-Use-labs-instead-of-abs.patch new file mode 100644 index 0000000..ea34cdb --- /dev/null +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-dvr-Use-labs-instead-of-abs.patch @@ -0,0 +1,37 @@ +From a715671eadcbf989fdaf05f62e71b93ac1749615 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Nov 2016 06:08:31 +0000 +Subject: [PATCH] dvr: Use labs() instead of abs() + +Makes clang happy + +dvr/dvr_db.c:853:10: error: absolute value function +'abs' given an argument of type 'long' but has parameter of type 'int' which may cause truncation of value [-Werror,-Wabsolute-value] +if ((abs(de->de_start - e->start) < 600) && (abs(de->de_stop - e->stop) < 600)) { + +Signed-off-by: Khem Raj +--- + src/dvr/dvr_db.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c +index 165caa6..5656569 100644 +--- a/src/dvr/dvr_db.c ++++ b/src/dvr/dvr_db.c +@@ -414,11 +414,11 @@ dvr_entry_fuzzy_match(dvr_entry_t *de, epg_broadcast_t *e) + /* Wrong length (+/-20%) */ + t1 = de->de_stop - de->de_start; + t2 = e->stop - e->start; +- if ( abs(t2 - t1) > (t1 / 5) ) ++ if ( labs(t2 - t1) > (t1 / 5) ) + return 0; + + /* Outside of window */ +- if (abs(e->start - de->de_start) > de->de_config->dvr_update_window) ++ if (labs(e->start - de->de_start) > de->de_config->dvr_update_window) + return 0; + + /* Title match (or contains?) */ +-- +1.9.1 + diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch new file mode 100644 index 0000000..484e723 --- /dev/null +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch @@ -0,0 +1,40 @@ +From c3767e189e90965407937b6178adbbd8cdafe31d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Nov 2016 05:59:10 +0000 +Subject: [PATCH] hdhomerun: Override forced overrdiing og CC/STRIP and CFLAGS + +This is required for cross compiling otherwise it ends up +using build host gcc + +Signed-off-by: Khem Raj +--- + Makefile.hdhomerun | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile.hdhomerun b/Makefile.hdhomerun +index 943ffec..8bd14ff 100644 +--- a/Makefile.hdhomerun ++++ b/Makefile.hdhomerun +@@ -18,8 +18,8 @@ + + include $(dir $(lastword $(MAKEFILE_LIST))).config.mk + +-unexport CFLAGS +-unexport LDFLAGS ++#unexport CFLAGS ++#unexport LDFLAGS + + define DOWNLOAD + @mkdir -p $(LIBHDHRDIR)/build +@@ -75,6 +75,8 @@ $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_download: + $(call DOWNLOAD,$(LIBHDHR_URL),$(LIBHDHRDIR)/$(LIBHDHR_TB),$(LIBHDHR_SHA1)) + $(call UNTAR,$(LIBHDHR_TB),z) + ln -sf libhdhomerun $(LIBHDHRDIR)/$(LIBHDHR) ++ @sed -i -e "s/CC.*:=/CC ?=/" $(LIBHDHRDIR)/$(LIBHDHR)/Makefile ++ @sed -i -e "s/STRIP.*:=/STRIP ?=/" $(LIBHDHRDIR)/$(LIBHDHR)/Makefile + @touch $@ + + $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build: \ +-- +1.9.1 + diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch deleted file mode 100644 index 55b9249..0000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- git/src/htsmsg.c.orig 2016-06-17 11:47:53.026921237 -0400 -+++ git/src/htsmsg.c 2016-06-17 11:49:03.086922457 -0400 -@@ -574,13 +574,13 @@ - case HMF_MAP: - printf("MAP) = {\n"); - htsmsg_print0(&f->hmf_msg, indent + 1); -- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); -+ for(i = 0; i < indent; i++) {printf("\t");} printf("}\n"); - break; - - case HMF_LIST: - printf("LIST) = {\n"); - htsmsg_print0(&f->hmf_msg, indent + 1); -- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); -+ for(i = 0; i < indent; i++) {printf("\t");} printf("}\n"); - break; - - case HMF_STR: ---- git/src/dvb/dvb_tables.c.orig 2016-06-17 11:51:09.142924652 -0400 -+++ git/src/dvb/dvb_tables.c 2016-06-17 11:54:33.962928219 -0400 -@@ -935,10 +935,10 @@ - onid = (ptr[24] << 8) | ptr[25]; - - /* Search all muxes on adapter */ -- LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) -- if(tdmi->tdmi_transport_stream_id == tsid && tdmi->tdmi_network_id == onid); -- break; -- -+ LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) { -+ if(tdmi->tdmi_transport_stream_id == tsid && tdmi->tdmi_network_id == onid) -+ break; -+ } - if(tdmi == NULL) - continue; - ---- git/src/epggrab/module/eit.c.orig 2016-06-17 11:49:57.726923409 -0400 -+++ git/src/epggrab/module/eit.c 2016-06-17 11:50:14.526923701 -0400 -@@ -214,7 +214,7 @@ - if (m && m->enabled) cptr = _eit_freesat_conv; - else - m = epggrab_module_find_by_id("uk_freeview"); -- if (m && m->enabled) cptr = _eit_freesat_conv; -+ if (m && m->enabled) cptr = _eit_freesat_conv; - - /* Convert */ - return dvb_get_string_with_len(dst, dstlen, src, srclen, charset, cptr); diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index bd5062c..300daa5 100644 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -1,22 +1,29 @@ SUMMARY = "Tvheadend TV streaming server" HOMEPAGE = "https://www.lonelycoder.com/redmine/projects/tvheadend" -DEPENDS = "avahi zlib openssl python-native" +DEPENDS = "avahi zlib openssl python-native dvb-apps" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" -SRC_URI = "git://github.com/tvheadend/tvheadend.git \ - file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \ - file://0002-fix-issues-with-gcc6.patch \ +SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=release/4.0 \ + file://0001-Fix-checks-for-sse2-mmx.patch \ + file://0001-disable-varargs-warning-on-clang.patch \ + file://0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch \ + file://0001-dvr-Use-labs-instead-of-abs.patch \ + file://0001-Makefile-Ignore-warning-about-wrong-includes.patch \ " -SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe" -PV = "3.3" +SRCREV = "64fec8120158de585e18be705055259484518d94" +PV = "4.0.9+git${SRCREV}" S = "${WORKDIR}/git" +PACKAGECONFIG ?= "" +PACKAGECONFIG[uriparser] = "--enable-uriparser,--disable-uriparser,uriparser" + do_configure() { - ./configure --prefix=${prefix} \ + ./configure ${PACKAGECONFIG_CONFARGS} \ + --prefix=${prefix} \ --libdir=${libdir} \ --bindir=${bindir} \ --datadir=${datadir} \ @@ -30,3 +37,5 @@ do_install() { } FILES_${PN} += "${datadir}/${BPN}" + +RDEPENDS_${PN} += "libdvben50221 libucsi libdvbapi"