X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;h=dd25ec4daadc5f89c7bc17648bf3e2725b8676ed;hb=6e3f6f45b2000e586b26d626139553144face1bc;hp=b2f054f5513b6493f31f805497dc5d1a7c7a5557;hpb=44a03bcd91c13fdb31e1a20423d2dd01247a955d;p=vuplus_openvuplus_3.0

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index b2f054f..dd25ec4 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -28,6 +28,23 @@ DEPENDS = " \
         util-linux \
 	"
 
+DEPENDS += " \
+	wireless-tools \
+	wpa-supplicant \
+	python-twisted \
+	curlftpfs \
+	fuse \
+	virtual/kernel \
+	aio-grab \
+	librtmp \
+	cdrkit \
+	libcddb \
+	libcdio \
+	avahi \
+	gstreamer1.0-plugins-good \
+	gstreamer1.0-plugins-bad \
+	"
+
 RDEPENDS_${PN} = " \
 	alsa-conf \
         ethtool \
@@ -88,6 +105,8 @@ GST_RDEPENDS = "${@base_contains('GST_VERSION', '1.0', ' \
 	gstreamer1.0-plugins-ugly-cdio \
 	gstreamer1.0-plugins-ugly-dvdsub \
 	gstreamer1.0-plugins-ugly-mad \
+	gstreamer1.0-plugins-ugly-amrnb \
+	gstreamer1.0-plugins-ugly-amrwbdec \
 	', ' \
 	gst-plugin-dvbmediasink \
 	gst-plugin-subsink \
@@ -130,6 +149,8 @@ GST_RDEPENDS = "${@base_contains('GST_VERSION', '1.0', ' \
 	gst-plugins-ugly-mad \
 	gst-plugins-ugly-mpegstream \
 	gst-plugins-ugly-mpegaudioparse \
+	gst-plugins-ugly-amrnb \
+	gst-plugins-ugly-amrwbdec \
 	', d)}"
 
 # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
@@ -168,7 +189,7 @@ RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-
 RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
 
 RDEPENDS_enigma2-plugin-extensions-streamtv = " \
-	librtmp1 \
+	librtmp \
 	${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-bad-rtmp", "gst-plugins-bad-rtmp", d)} \
 "
 
@@ -185,27 +206,29 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 "
 
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
-RDEPENDS_enigma2-plugin-systemplugins-netdrive = "curlftpfs kernel-module-fuse libfuse2"
+RDEPENDS_enigma2-plugin-systemplugins-netdrive = "curlftpfs kernel-module-fuse fuse"
 
 RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd-utils-nanddump mtd-utils-ubinize"
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
+DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
+RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
+
 PN = "enigma2"
-PR = "r94"
+PR = "r102"
 
 inherit gitpkgv pythonnative
 
 ####################################################
-PV = "experimental-gitr${SRCPV}"
-PKGV = "experimental-gitr${GITPKGV}"
-BRANCH = "gst10"
+SRCDATE = "20121128"
+PV = "experimental-git${SRCDATE}"
+BRANCH = "vuplus_experimental_gst10"
 SRCREV = ""
 ####################################################
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
 
-#SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} 
-SRC_URI = "git:///home/joseph/work2/work/enigma2;protocol=file;branch=${BRANCH};tag=${SRCREV} \
+SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};rev=${SRCREV} \
 	file://enigma2_vuplus_skin.patch \
 	file://enigma2_vuplus_mediaplayer.patch \
 	file://enigma2_vuplus_remove_dreambox_enigma.patch \
@@ -298,6 +321,7 @@ EXTRA_OECONF = " \
 	${@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)} \
 	${@base_contains("VUPLUS_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \
+	${@base_contains("VUPLUS_FEATURES", "uianimation", "--with-libvugles2" , "", d)} \
 	BUILD_SYS=${BUILD_SYS} \
 	HOST_SYS=${HOST_SYS} \
 	STAGING_INCDIR=${STAGING_INCDIR} \
@@ -312,3 +336,9 @@ python populate_packages_prepend() {
     do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 }
 
+INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP_enigma2-plugin-extensions-webbrowser = "build-deps"
+INSANE_SKIP_enigma2-plugin-extensions-modem = "build-deps"
+
+
+