Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
index 8aa881e..bbc4f26 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
@@ -2,11 +2,9 @@ SUMMARY = "tuxbox libtuxtxt"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://libtuxtxt/libtuxtxt.c;endline=19;md5=75fd12b0664044ec3b3182337e21e98f"
 DEPENDS = "dreambox-dvbincludes libpng freetype"
-SRCDATE = "20090130"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/libs;method=ext \
+SRC_URI = "http://code.vuplus.com/git/support/apps.tuxbox.libs_cvs.tuxbox.org__20090130.tar.gz \
         file://acinclude.m4 \
         file://ignorelibs.patch \
         file://32bpp.diff \
@@ -26,3 +24,7 @@ do_configure_prepend() {
 }
 
 CPPFLAGS += "-DHAVE_DREAMBOX_HARDWARE -DDREAMBOX"
+
+SRC_URI[md5sum] = "4b23e7319269ba583b77e894a9e784b6"
+SRC_URI[sha256sum] = "3a4f59e7fc96ccc1c8b99d3976fc8e8af326e9c2af16ef94d1f500a47df43052"
+

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
index 891abc7..6205ece 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
@@ -3,11 +3,9 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://tuxtxt.c;endline=19;md5=4f3fd30feb71f556493f38c7a8b3ca4d"
 DEPENDS = "freetype tuxbox-libtuxtxt"
 RDEPENDS_${PN} = "enigma2"
-SRCDATE = "20090130"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r5"
+PR = "r6"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/plugins/tuxtxt;method=ext \
+SRC_URI = "http://code.vuplus.com/git/support/apps.tuxbox.plugins.tuxtxt_cvs.tuxbox.org__20090130.tar.gz \
         file://makefiles.diff \
         file://nonblocking.diff \
         file://32bpp.diff \
@@ -30,3 +28,7 @@ do_configure_prepend() {
 FILES_${PN} += "${datadir}/fonts/tuxtxt.otb ${libdir}/enigma2 /etc/tuxtxt"
 
 CPPFLAGS += "-DHAVE_DREAMBOX_HARDWARE -DDREAMBOX -I${STAGING_INCDIR}/tuxbox/tuxtxt"
+
+SRC_URI[md5sum] = "395116a358bac2b7f23923454997cab1"
+SRC_URI[sha256sum] = "c26387820df3b49f4f40048f1adf4ed0a1fdbf74fc0950748e0785e60aba073f"
+