Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2.bb

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 76302b3..1a7ec06 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -88,15 +88,14 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r72"
+PR = "r90"
 
 inherit gitpkgv pythonnative
 
-PKGV = "git${GITPKGV}"
-
 ####################################################
+PV = "experimental-gitr${SRCPV}"
+PKGV = "experimental-gitr${GITPKGV}"
 BRANCH = "vuplus_experimental"
-PV = "experimental-git${SRCPV}"
 SRCREV = ""
 ####################################################
 
@@ -108,7 +107,6 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
        file://enigma2_vuplus_mediaplayer_subtitle.patch \
        file://enigma2_vuplus_remove_dreambox_enigma.patch \
        file://enigma2_vuplus_vfd_mode.patch \
-       file://enigma2_vuplus_addlibpythondeps.patch \
        file://enigma2_vuplus_pluginbrowser.patch \
        file://enigma2_vuplus_proc_oom_score_adj.patch \
         file://enigma2_vuplus_fix_standby_name.patch \
@@ -125,7 +123,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
        file://number_key \
 "
 
-SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
+SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", d)}"
 
 def change_po():
     import os
@@ -185,6 +183,7 @@ do_compile_prepend_vuplus() {
 }
 
 EXTRA_OECONF = " \
+        --enable-dependency-tracking \
        ${@base_contains("VUPLUS_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \
        ${@base_contains("VUPLUS_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \
        ${@base_contains("VUPLUS_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \