getmuxlist: use own dtv-scan-tables repository (quick fixes, merges)

diff --git a/Makefile b/Makefile
index 039a130c7b28402c4e57302f554330b2aaeef3fc..17f48230f99bba6c4b06f0822570fd4bbad54164 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -705,7 +705,7 @@ ${BUILDDIR}/hdhomerun/libhdhomerun/libhdhomerun.a: Makefile.hdhomerun
 
 # linuxdvb git tree
 $(ROOTDIR)/data/dvb-scan/.stamp:
-       @echo "Receiving data/dvb-scan/dvb-t from http://linuxtv.org/git/dtv-scan-tables.git"
+       @echo "Receiving data/dvb-scan/dvb-t from https://github.com/tvheadend/dtv-scan-tables.git#tvheadend"
        @rm -rf $(ROOTDIR)/data/dvb-scan/*
        @$(ROOTDIR)/support/getmuxlist $(ROOTDIR)/data/dvb-scan
        @touch $@

diff --git a/support/getmuxlist b/support/getmuxlist
index e8ed054c64b97dad07f816d64dffe1c5dcc2f189..5fe4c72a7962ccf04fd64f18e34af6bb9f66e4aa 100755 (executable)
--- a/support/getmuxlist
+++ b/support/getmuxlist
@@ -17,8 +17,9 @@ if [ -d "${DIR}/.git" ]; then
   cd "${LAST}" || exit 1
 # Fetch
 elif [ ! -d "${DIR}" ]; then
-  URL=http://linuxtv.org/git/dtv-scan-tables.git
-  git clone $URL "${DIR}" > /dev/null 2>&1 || exit 1
+  URL=https://github.com/tvheadend/dtv-scan-tables.git
+  BRANCH=tvheadend
+  git clone -b $BRANCH $URL "${DIR}" > /dev/null 2>&1 || exit 1
 fi
 
 # Note: will not update existing set (if not .git)