X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Ftuxbox%2Ftuxbox-common.bb;h=ecfbc3a53dc2acfd2bf8547c2e37ca16519d3a66;hp=d20cd52d46b2b911ec51eda155897e18126d5d39;hb=c5cfa5b93ed4a475beb1bde8ec7b707bea2097c1;hpb=e4d27bbda12629ef9f8d97ee6fc850e28ffe5ba7

diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
index d20cd52..ecfbc3a 100644
--- a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
@@ -4,33 +4,29 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
 
 PN = "tuxbox-common"
-PR = "r4"
+PR = "r7"
 
-SRC_REV = "8ef7a7f5f5df5f77197ad279e24b0dc454b8210b"
+SRC_REV = "12436bfb31dafdc4c73bc4bb5d4cb39a0855c95e"
 
-SRC_URI = "git://git.code.sf.net/p/tuxbox-cvs/cdk;protocol=git;tag=${SRC_REV} \
-        http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r11.tar.gz;name=tar \
-        file://satellites_20130124.patch;patch=1;pnum=1 \
-"
-SRC_URI[tar.md5sum] = "b33829644e7d5be373edabffaf9803f2"
-SRC_URI[tar.sha256sum] = "3399bb99a59acfcb12a48480d43934f989b0363cab5b5388341196cd5d2a1149"
+SRC_URI = "git://code.vuplus.com/git/dvbapp-meta.git;protocol=git;tag=${SRC_REV} "
+SRC_URI += "file://add_uhd_channels.patch"
 
 FILES_${PN} = "/"
 
-S = "${WORKDIR}/git/root_dream/share"
+S = "${WORKDIR}/git"
 
 TRANSPONDER_LISTS = "satellites.xml terrestrial.xml"
 
 do_install() {
 	install -d ${D}/etc/tuxbox/
 	install -d ${D}/usr/share/tuxbox
-	install -m 0644 ${WORKDIR}/tuxbox-common-r11/scart.conf ${D}/etc/tuxbox/scart.conf
-	install -m 0644 ${WORKDIR}/tuxbox-common-r11/timezone.xml ${D}/etc/tuxbox/timezone.xml
+	install -m 0644 ${S}/scart.conf ${D}/etc/tuxbox/scart.conf
+	install -m 0644 ${S}/timezone.xml ${D}/etc/tuxbox/timezone.xml
 	ln -sf /etc/tuxbox/timezone.xml ${D}/etc/
 	ln -sf /usr/share ${D}/share
 
 	for i in ${TRANSPONDER_LISTS}; do
-		install -m 0644 ${S}/tuxbox/$i ${D}/etc/tuxbox/$i
+		install -m 0644 ${S}/$i ${D}/etc/tuxbox/$i
 		ln -sf /etc/tuxbox/$i ${D}/etc/;
 		ln -sf /etc/tuxbox/$i ${D}/usr/share/;
 		ln -sf /etc/tuxbox/$i ${D}/usr/share/tuxbox/;