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 513f8d1..4d9b5ea 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
@@ -5,7 +5,9 @@ DEPENDS = "freetype tuxbox-libtuxtxt"
 RDEPENDS_${PN} = "enigma2"
 PR = "r7"
 
-SRC_URI = "git://code.vuplus.com/git/tuxbox-tuxtxt.git;protocol=git;tag=HEAD \
+SRCREV = "master"
+
+SRC_URI = "git://code.vuplus.com/git/tuxbox-tuxtxt.git;protocol=git \
         file://makefiles.diff \
         file://nonblocking.diff \
         file://32bpp.diff \
@@ -13,16 +15,17 @@ SRC_URI = "git://code.vuplus.com/git/tuxbox-tuxtxt.git;protocol=git;tag=HEAD \
         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}/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"