mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

tvheadend: add a patch to fix issues with gcc 6 and drop the -Wno-error=misleading-indentation

Browse Source 
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Derek Straka
2016-06-17 12:00:27 -04:00
committed by Martin Jansa
parent d24e984e28
commit 90488aa54d
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch Normal file
View File

@@ -0,0 +1,46 @@
--- 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);

3
meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
View File

@@ -8,14 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746"
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 \
"
SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe"
PV = "3.3"
S = "${WORKDIR}/git"
TARGET_CFLAGS += "-Wno-error=misleading-indentation"
do_configure() {
./configure --prefix=${prefix} \
--libdir=${libdir} \