package/tvheadend: update to v3.5

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff -durN tvheadend-v3.3.orig//configure tvheadend-v3.3/configure

--- tvheadend-v3.3.orig//configure	2012-09-25 15:32:31.000000000 +0200

+++ tvheadend-v3.3/configure	2012-12-28 17:17:23.580253413 +0100

@@ -96,13 +96,14 @@

diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure

--- tvheadend-v3.5.orig/configure	2013-02-15 14:41:26.000000000 +0100

+++ tvheadend-v3.5/configure	2013-02-16 15:41:16.675556099 +0100

@@ -178,15 +178,16 @@

 #

 # DVB scan

 #

-if enabled linuxdvb && enabled dvbscan; then

-  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then

-    echo -n "Fetching dvb-scan files... "

-    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"

-    echo "done"

-  printf "${TAB}" "fetching dvb-scan files ..."

-  ${ROOTDIR}/support/getmuxlist

-  if [ $? -ne 0 ]; then

-    echo "fail"

-    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"

-  fi

-  echo "ok"

-fi

+# For buildroot, we already installed those files via the dvb-apps package

+#if enabled linuxdvb && enabled dvbscan; then

+#  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then

+#    echo -n "Fetching dvb-scan files... "

+#    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"

+#    echo "done"

+#  printf "${TAB}" "fetching dvb-scan files ..."

+#  ${ROOTDIR}/support/getmuxlist

+#  if [ $? -ne 0 ]; then

+#    echo "fail"

+#    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"

+#  fi

+#  echo "ok"

+#fi

 # ###########################################################################

 # Write config

diff -durN tvheadend-v3.3.orig//Makefile tvheadend-v3.3/Makefile

--- tvheadend-v3.3.orig//Makefile	2012-09-25 15:32:31.000000000 +0200

+++ tvheadend-v3.3/Makefile	2012-12-28 17:17:47.573497346 +0100

@@ -180,7 +180,7 @@

Binary files tvheadend-v3.5.orig/.configure.swp and tvheadend-v3.5/.configure.swp differ

diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile

--- tvheadend-v3.5.orig/Makefile	2013-02-15 14:41:26.000000000 +0100

+++ tvheadend-v3.5/Makefile	2013-02-16 15:41:38.218821287 +0100

@@ -207,7 +207,7 @@

 SRCS-${CONFIG_BUNDLE}     += bundle.c

 BUNDLES-yes               += docs/html docs/docresources src/webui/static

 BUNDLES-yes               += data/conf

 BUNDLES                    = $(BUNDLES-yes)

 #

diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk

--- tvheadend-v3.3.orig//support/posix.mk	2012-09-25 15:32:31.000000000 +0200

+++ tvheadend-v3.3/support/posix.mk	2012-12-28 17:19:28.903121722 +0100

@@ -12,7 +12,8 @@

 		mkdir -p ${DESTDIR}${datadir}/tvheadend/$$bundle ;\

 		cp -r $$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\

 	done

-

diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk

--- tvheadend-v3.5.orig/support/posix.mk	2013-02-15 14:41:26.000000000 +0100

+++ tvheadend-v3.5/support/posix.mk	2013-02-16 15:42:41.015290003 +0100

@@ -15,6 +15,10 @@

 	find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true

+	mkdir -p ${DESTDIR}${datadir}/tvheadend/data

+	rm -f ${DESTDIR}${datadir}/tvheadend/data/dvb-scan

+	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan

+

 uninstall:

 	rm -f ${DESTDIR}${bindir)/tvheadend

 	rm -f ${DESTDIR}${mandir)/tvheadend.1

Makefile: do not use check_config

test(1) only uses the second to compare two files dates.

test(1) also does a strict comparison wrt. dates.

But, on very fast systems, the configure and .config.mk

files may be created in the same second, and so would lead

to a false comparison of the files' dates.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile

--- tvheadend-v3.5.orig/Makefile	2013-02-17 15:15:03.228749505 +0100

+++ tvheadend-v3.5/Makefile	2013-02-17 15:15:51.591923062 +0100

@@ -246,7 +246,7 @@

 	$(CURDIR)/configure $(CONFIGURE_ARGS)

 # Binary

-${PROG}: check_config $(OBJS) $(ALLDEPS)

+${PROG}: $(OBJS) $(ALLDEPS)

 	$(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)

 # Object

commit 1334869bf0ea668e58e1c72daa3c09c1a95b5d81

Author: Alexey I. Froloff <raorn@raorn.name>

Date:   Wed Oct 24 21:10:15 2012 +0400

    [PR-172] Fix compilatioin issues on OpenWRT

    Fix SHA1_* function names

    Fix unused variables and functions

---

"Yann E. MORIN" <yann.morin.1998@free.fr>:

    For buildroot, I removed the SHA_* fixes, as we're not affected.

    No point in fixing something that does not bug us.

diff --git a/src/trap.c b/src/trap.c

index bd76118..b0fe543 100644

--- a/src/trap.c

+++ b/src/trap.c

@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...)

 /**

  *

  */

+#if ENABLE_EXECINFO

 static int

 add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)

 {

@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)

   close(fd[0]);

   return 0;

 }

+#endif /* ENABLE_EXECINFO */

@@ -133,8 +135,8 @@ static void

 traphandler(int sig, siginfo_t *si, void *UC)

 {

   ucontext_t *uc = UC;

-  char buf[200];

 #if ENABLE_EXECINFO

+  char buf[200];

   static void *frames[MAXFRAMES];

   int nframes = backtrace(frames, MAXFRAMES);

   Dl_info dli;

epggrab: do not include wordexp.h

Nothing from wordexp.h is needed (stray include?)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---

Patch sent upstream, but no mailing-list. :-(

Status: awaiting feedback.

diff -durN tvheadend-v3.3.orig/src/epggrab.c tvheadend-v3.3/src/epggrab.c

--- tvheadend-v3.3.orig/src/epggrab.c	2012-09-25 15:32:31.000000000 +0200

+++ tvheadend-v3.3/src/epggrab.c	2012-12-31 19:22:29.768431849 +0100

@@ -20,7 +20,6 @@

 #include <stdlib.h>

 #include <string.h>

 #include <assert.h>

-#include <wordexp.h>

 #include <unistd.h>

 #include <sys/types.h>

 #include <sys/un.h>

#

##############################################################

TVHEADEND_VERSION           = v3.3

TVHEADEND_VERSION           = v3.5

TVHEADEND_SITE              = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION)

TVHEADEND_LICENSE           = GPLv3+

TVHEADEND_LICENSE_FILES     = LICENSE