package/tvheadend: update to a git snapshot
authorYann E. MORIN <yann.morin.1998@free.fr>
Mon, 3 Jun 2013 10:15:47 +0000 (10:15 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 3 Jun 2013 21:00:27 +0000 (23:00 +0200)
There are a buncha fixes that are not available in a release yet.

Needs refreshing our patches.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
package/tvheadend/tvheadend-002-no-check_config.patch
package/tvheadend/tvheadend.mk

index cc25c564cc21a15e165bc48402e9a5946403d19c..b64627e5cfc30749b6c58e6f28abdcc76b674c1f 100644 (file)
@@ -11,13 +11,13 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 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 @@
+@@ -179,15 +179,16 @@
  #
  # DVB scan
  #
 -if enabled linuxdvb && enabled dvbscan; then
 -  printf "${TAB}" "fetching dvb-scan files ..."
--  ${ROOTDIR}/support/getmuxlist
+-  "${ROOTDIR}/support/getmuxlist"
 -  if [ $? -ne 0 ]; then
 -    echo "fail"
 -    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
@@ -27,7 +27,7 @@ diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
 +# For buildroot, we already installed those files via the dvb-apps package
 +#if enabled linuxdvb && enabled dvbscan; then
 +#  printf "${TAB}" "fetching dvb-scan files ..."
-+#  ${ROOTDIR}/support/getmuxlist
++#  "${ROOTDIR}/support/getmuxlist"
 +#  if [ $? -ne 0 ]; then
 +#    echo "fail"
 +#    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
@@ -37,11 +37,10 @@ diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
  
  # ###########################################################################
  # Write config
-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 @@
+@@ -211,7 +211,7 @@
  SRCS-${CONFIG_BUNDLE}     += bundle.c
  BUNDLES-yes               += docs/html docs/docresources src/webui/static
  BUNDLES-yes               += data/conf
@@ -62,5 +61,5 @@ diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk
 +      ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
 +
  uninstall:
-       rm -f ${DESTDIR}${bindir)/tvheadend
-       rm -f ${DESTDIR}${mandir)/tvheadend.1
+       rm -f ${DESTDIR}${bindir}/tvheadend
+       rm -f ${DESTDIR}${mandir}/tvheadend.1
index a0edcdcfde3b515d568952161b4355b9cca185cf..aad04e5011b546673bdda550fd4927a154e9e97d 100644 (file)
@@ -12,8 +12,8 @@ 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)
+@@ -250,7 +250,7 @@
+       $(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
 -${PROG}: check_config $(OBJS) $(ALLDEPS)
index 58965d6831725cd1b2055ca6513c493f018113f5..5ddcd75cf7fc8d0f83a8d79af1c046cc9871c5da 100644 (file)
@@ -4,8 +4,8 @@
 #
 ##############################################################
 
-TVHEADEND_VERSION           = v3.5
-TVHEADEND_SITE              = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION)
+TVHEADEND_VERSION           = 5513b44
+TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE
 TVHEADEND_DEPENDENCIES      = host-pkgconf host-python openssl