X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;h=bd6d959b7970235c1876b4803ddbc74b23437f37;hp=ccbeb068b5bb2de2b155699763bacd4b69f3da8b;hb=42f0cc9ac2256e062368452f98b9db4b62ae8359;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index ccbeb06..bd6d959 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -49,7 +49,7 @@ SUMMARY_enigma2-plugin-systemplugins-satelliteequipmentcontrol = "allows you to
 SUMMARY_enigma2-plugin-systemplugins-satfinder = "helps you to align your dish."
 SUMMARY_enigma2-plugin-systemplugins-skinselector = "shows a menu with selectable skins."
 SUMMARY_enigma2-plugin-systemplugins-videomode = "selects advanced video modes"
-RDEPENDS_enigma2-plugin-extensions-dvdplayer = "libdreamdvd0"
+DEPENDS_enigma2-plugin-extensions-dvdplayer = "libdreamdvd0"
 RDEPENDS_enigma2-plugin-systemplugins-nfiflash = "python-twisted-web"
 RDEPENDS_enigma2-plugin-systemplugins-softwaremanager = "python-twisted-web"
 RCONFLICTS_enigma2-plugin-systemplugins-softwaremanager = "enigma2-plugin-systemplugins-configurationbackup enigma2-plugin-systemplugins-softwareupdate"
@@ -67,49 +67,33 @@ 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-3gmodemmanager = "ppp usbmodeswitch usbmodeswitch-data wvdial wvstreams libwvutils4.6 libwvstreams-extras libuniconf4.6"
 RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
+
 RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp "
-RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount fuse-utils libfuse2 libupnp3 kernel-module-fuse "
-RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna libexif12 libavformat52 libavutil50 libavcodec52 libgsm1 libmp3lame0 libschroedinger-1.0-0 libtheora0 liboil"
+
+DEPENDS += "djmount minidlna"
+RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna "
+RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount kernel-module-fuse fuse-utils"
+
+DEPENDS += "opera-hbbtv"
+RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"
+
+DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data"
+RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams kernel-module-usbserial"
 
 PN = "enigma2"
-PR = "r38"
+PR = "r40"
 
-SRCDATE = "20110922"
-SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"
+SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
 #but we need it to build a ipk package version
 #when you like to checkout a specific revision of e2 you need
 #have to specify a commit id or a tag name in SRCREV
 
-# if you want experimental use
 ####################################################
-BRANCH = "experimental"
+BRANCH = "vuplus_experimental"
 PV = "experimental-git${SRCDATE}"
-#SRCREV = ""
-####################################################
-
-# if you want a 2.7-based release, use
-####################################################
-#BRANCH="2.7"
-#PV = "2.7git${SRCDATE}"
-# if you want 2.7.0 use
-#SRCREV = "d5a16c6e9d0ee1cc2dc0d65b4321842dea4b0891"
-####################################################
-
-# if you want a vuplus release, use
-####################################################
-#BRANCH_vuplus = "vuplus"
-#PV_vuplus = "2.8git${SRCDATE}"
-#SRCREV_vuplus = "4186f8c308d9450353520a88eb5a5ee3940281d3"
-####################################################
-
-#if you want a vuplus experimental, use
-####################################################
-BRANCH_vuplus = "vuplus_experimental"
-PV_vuplus = "experimental-git${SRCDATE}"
-SRCREV_vuplus = ""
+SRCREV = ""
 ####################################################
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
@@ -121,6 +105,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
            file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
            file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
+           file://enigma2_wirelessaccesspoint.patch;patch=1;pnum=1 \
            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \
            file://MyriadPro-SemiboldIt.otf \
@@ -166,6 +151,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit autotools pkgconfig
 
+do_configure_prepend() {
+	git checkout ${BRANCH}
+}
 
 do_compile_prepend_vuplus() {
         install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
@@ -206,21 +194,3 @@ python populate_packages_prepend() {
 
 RCONFLICTS_${PN} = "dreambox-keymaps"
 RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)"
-
-# workaround for opkg <= 0.1.7+svnr455-r19.1
-#pkg_preinst_${PN} () {
-#	if [ "x$D" != "x" ]; then
-#		exit 1
-#	fi
-#	if [ -f ${datadir}/fonts/tuxtxt.ttf ]; then
-#		cp -a ${datadir}/fonts/tuxtxt.ttf /tmp/tuxtxt.ttf
-#	fi
-#}
-#pkg_postinst_${PN} () {
-#	if [ "x$D" != "x" ]; then
-#		exit 1
-#	fi
-#	if [ -f /tmp/tuxtxt.ttf -a ! -f ${datadir}/fonts/tuxtxt.ttf ]; then
-#		mv /tmp/tuxtxt.ttf ${datadir}/fonts/tuxtxt.ttf
-#	fi
-#}