diff options
Diffstat (limited to 'meta-multimedia/recipes-dvb/tvheadend')
6 files changed, 0 insertions, 223 deletions
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 deleted file mode 100644 index 3283a5b6ad..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Fix-checks-for-sse2-mmx.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f0dab6d6fe4b0aae4394eee93be86e9747c6ed5c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 deleted file mode 100644 index 248a5e6a8a..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Makefile-Ignore-warning-about-wrong-includes.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7d672305c7ad2f716dfe1c487b525a1a92954d4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <sys/poll.h> to <poll.h> [-Werror,-W#warnings] -| #warning redirecting incorrect #include <sys/poll.h> to <poll.h> -| ^ -| In file included from src/avahi.c:48: - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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-disable-varargs-warning-on-clang.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-disable-varargs-warning-on-clang.patch deleted file mode 100644 index a4c4c4d0fd..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-disable-varargs-warning-on-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 906d95695af95970bf551ea55b6c3e70332c6b97 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 deleted file mode 100644 index ea34cdb62c..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-dvr-Use-labs-instead-of-abs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a715671eadcbf989fdaf05f62e71b93ac1749615 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 deleted file mode 100644 index 484e723d97..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-hdhomerun-Override-forced-overrdiing-og-CC-STRIP-and.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c3767e189e90965407937b6178adbbd8cdafe31d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb deleted file mode 100644 index 3b73549d2d..0000000000 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Tvheadend TV streaming server" -HOMEPAGE = "https://www.lonelycoder.com/redmine/projects/tvheadend" - -DEPENDS = "avahi zlib openssl python-native dvb-apps" - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" - -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 = "64fec8120158de585e18be705055259484518d94" -PV = "4.0.9+git${SRCREV}" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[uriparser] = "--enable-uriparser,--disable-uriparser,uriparser" - -do_configure() { - ./configure ${PACKAGECONFIG_CONFARGS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --bindir=${bindir} \ - --datadir=${datadir} \ - --arch=${TARGET_ARCH} \ - --disable-dvbscan \ - --disable-bundle -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - -FILES_${PN} += "${datadir}/${BPN}" - -RDEPENDS_${PN} += "libdvben50221 libucsi libdvbapi" - -PNBLACKLIST[tvheadend] ?= "Depends on blacklisted dvb-apps - the recipe will be removed on 2017-09-01 unless the issue is fixed" |