X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;h=0d95974bdb4618663efc62eb775ef0027ce6a7ab;hp=76302b31a494a2cd483e14663d3a1d421bebde0d;hb=03e8e707150f231306ece038ed8327d05aa2ebc6;hpb=ac51712fd2b9bdfd17839736c343185c1110953c

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 76302b3..0d95974 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -7,7 +7,7 @@ DEPENDS = "jpeg giflib libmad libpng libsigc++-1.2 gettext-native \
 	dreambox-dvbincludes freetype libdvbsi++ python swig-native \
 	libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \
 	gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \
-	hostap-daemon bridge-utils ntfs-3g dosfstools util-linux \
+	hostapd bridge-utils ntfs-3g dosfstools util-linux \
 "
 
 GST_RDEPENDS = "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
@@ -65,7 +65,7 @@ SUMMARY_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step
 RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon "
 SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+"
 RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email"
-RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
+RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
 
 RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp "
 
@@ -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 = "r93"
 
 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 \
@@ -117,6 +115,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
 	file://enigma2_vuplus_eptrlist_insert.patch \
 	file://enigma2_vuplus_conversion_error.patch \
 	file://enigma2_vuplus_default_arg_error.patch \
+	file://enigma2_vuplus_wrong_boolean_type.patch \
 	file://MyriadPro-Regular.otf \
 	file://MyriadPro-Semibold.otf \
 	file://MyriadPro-SemiboldIt.otf \
@@ -125,7 +124,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 +184,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)} \