Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / tuxtxt / tuxbox-libtuxtxt.bb

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
index 8aa881e..9f9e70f 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
@@ -2,11 +2,11 @@ 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 = "r3"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/libs;method=ext \
+SRCREV = "master"
+
+SRC_URI = "git://code.vuplus.com/git/tuxbox-libs.git;protocol=git \
         file://acinclude.m4 \
         file://ignorelibs.patch \
         file://32bpp.diff \
@@ -14,9 +14,10 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/libs;metho
         file://allow_different_demux.diff \
         file://videodev2.patch \
         file://libz.patch \
+        file://libtuxtxt_buildfix.patch \
 "
 
-S = "${WORKDIR}/libs"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig