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

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

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
index 891abc7..4d9b5ea 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,11 @@ 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 = "r7"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/plugins/tuxtxt;method=ext \
+SRCREV = "master"
+
+SRC_URI = "git://code.vuplus.com/git/tuxbox-tuxtxt.git;protocol=git \
         file://makefiles.diff \
         file://nonblocking.diff \
         file://32bpp.diff \
@@ -15,18 +15,20 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/plugins/tu
         file://add_advanced_rc.diff \
         file://allow_different_demux.diff \
         file://plugin.py \
-       file://tuxtxt_vuplus.patch;patch=1;pnum=1 \
+       file://tuxtxt_vuplus.patch \
 "
 
-S = "${WORKDIR}/tuxtxt"
+S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools pkgconfig
 
 do_configure_prepend() {
         touch ${S}/python/__init__.py
         install -m 0644 ${WORKDIR}/plugin.py ${S}/python
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
 }
 
 FILES_${PN} += "${datadir}/fonts/tuxtxt.otb ${libdir}/enigma2 /etc/tuxtxt"
 
 CPPFLAGS += "-DHAVE_DREAMBOX_HARDWARE -DDREAMBOX -I${STAGING_INCDIR}/tuxbox/tuxtxt"
+