Include dvb-scan-tables as source

Instead of allowing build to pull a clean copy every time.

2 files changed, 16 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21d111403d27..ff1b65625662 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 14 04:06:07 UTC 2016
+# Mon Mar 14 04:23:54 UTC 2016
 pkgbase = tvheadend-git
 	pkgdesc = TV streaming server for Linux
 	pkgver = 4.1.r1672.g3927788
-	pkgrel = 1
+	pkgrel = 2
 	url = https://tvheadend.org/
 	install = tvheadend.install
 	arch = i686
@@ -26,8 +26,10 @@ pkgbase = tvheadend-git
 	conflicts = hts-tvheadend-svn
 	conflicts = tvheadend-git
 	source = tvheadend-git::git+https://github.com/tvheadend/tvheadend.git#branch=master
+	source = dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend
 	source = tvheadend.service
 	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = b546f4486f0d28bea13ad1fb676acb27
 
 pkgname = tvheadend-git
diff --git a/PKGBUILD b/PKGBUILD
index 79d89c66a622..f122472d5107 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=tvheadend-git
 _gitname='tvheadend-git'
 pkgver=4.1.r1672.g3927788
-pkgrel=1
+pkgrel=2
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="https://tvheadend.org/"
@@ -20,9 +20,11 @@ conflicts=('tvheadend' 'hts-tvheadend' 'hts-tvheadend-svn' 'tvheadend-git')
 install=tvheadend.install
 
 source=("${_gitname}::git+https://github.com/tvheadend/tvheadend.git#branch=master"
-	'tvheadend.service')
+        "dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend"
+        'tvheadend.service')
 
 md5sums=('SKIP'
+         'SKIP'
          'b546f4486f0d28bea13ad1fb676acb27')
 
 pkgver() {
@@ -30,6 +32,14 @@ pkgver() {
     git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+    cd "${srcdir}"
+    _dvbscan="${_gitname}/data/dvb-scan"
+    cp -a "dvb-scan-tables" "${_dvbscan}"
+    rm -rf "${_dvbscan}/.git"
+    touch "${_dvbscan}/.stamp"
+}
+
 build() {
     cd "${srcdir}/${_gitname}"
     ./configure --prefix=/usr --mandir=/usr/share/man/man1 --python=python2 --release \