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=7393759bb06894ffa8e86fed67eacf0800dc0d27;hp=b364ec6914a1fbeb2e5f3470057d44eaba286bf4;hb=26b35f920479efdd7ac19f5cb96680413987aa6d;hpb=38875c9b5c043e066ed208f4d2ac79c1bd5b4c83

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index b364ec6..7393759 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -3,34 +3,166 @@ MAINTAINER = "vuplus team"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3"
 
-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 \
-"
+DEPENDS = " \
+        jpeg \
+        giflib \
+        libmad \
+        libpng \
+        libsigc++-1.2 \
+        gettext-native \
+        dreambox-dvbincludes \
+        freetype \
+        libdvbsi++ \
+        python \
+        swig-native \
+        libfribidi \
+        libxml2 \
+        libxmlccwrap \
+        libdreamdvd \
+        ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-base gstreamer1.0", "gst-plugins-base gstreamer", d)} \
+        python-wifi \
+        hostapd \
+        bridge-utils \
+        ntfs-3g \
+        dosfstools \
+        util-linux \
+        fuse-exfat \
+        satipclient \
+	"
 
-GST_RDEPENDS = "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
-	gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \
-	gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \
-	gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \
-	gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \
-	gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \
-	gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \
-	gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-good-avi gst-plugins-bad-faad \
-"
+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 \
+	"
 
-GST_RTSP_RDEPENDS = "gst-plugins-good-udp gst-plugins-good-rtsp gst-plugins-good-rtp gst-plugins-good-rtpmanager"
-GST_ALSA_RDEPENDS = "gst-plugins-base-alsa alsa-conf"
-GST_MISC_RDEPENDS = "gst-plugins-good-matroska gst-plugins-good-isomp4 gst-plugins-base-vorbis gst-plugins-good-audioparsers"
-GST_DVD_RDEPENDS  = "gst-plugins-bad-cdxaparse gst-plugins-ugly-cdio gst-plugins-bad-vcdsrc"
-GST_BASE_RDEPENDS = "${GST_ALSA_RDEPENDS} ${GST_MISC_RDEPENDS} ${GST_RTSP_RDEPENDS}"
+DEPENDS += " \
+	vuplus-3gcommand \
+	vuplus-dlnaserver \
+	"
 
-RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
-	python-xml python-fcntl python-stringold python-pickle python-netclient \
-	glibc-gconv-iso8859-15 ethtool parted \
-	${GST_RDEPENDS} ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} \
-"
+RDEPENDS_${PN} = " \
+	alsa-conf \
+        ethtool \
+	glibc-gconv-iso8859-15 \
+        parted \
+	${PYTHON_RDEPS} \
+	${GST_RDEPENDS} \
+	fuse-exfat \
+	util-linux-partx \
+	vuplus-skins \
+	${@base_contains("VUPLUS_FEATURES", "dvbproxy", "vuplus-dvb-proxy libgles vuplus-platform-util", "vuplus-dvb-modules", d)} \
+	"
+
+PYTHON_RDEPS = " \
+        python-codecs \
+        python-core \
+        python-lang \
+        python-re \
+        python-threading \
+        python-xml \
+        python-fcntl \
+        python-stringold \
+        python-pickle \
+        python-netclient \
+	"
+
+GST_RDEPENDS = "${@base_contains('GST_VERSION', '1.0', ' \
+	gstreamer1.0-plugin-dvbmediasink \
+	gstreamer1.0-plugin-subsink \
+	gstreamer1.0-plugins-base-alsa \
+	gstreamer1.0-plugins-base-app \
+	gstreamer1.0-plugins-base-audioconvert \
+	gstreamer1.0-plugins-base-audioresample \
+	gstreamer1.0-plugins-base-ogg \
+	gstreamer1.0-plugins-base-playback \
+	gstreamer1.0-plugins-base-subparse \
+	gstreamer1.0-plugins-base-typefindfunctions \
+	gstreamer1.0-plugins-base-vorbis \
+	gstreamer1.0-plugins-good-apetag \
+	gstreamer1.0-plugins-good-audioparsers \
+	gstreamer1.0-plugins-good-autodetect \
+	gstreamer1.0-plugins-good-avi \
+	gstreamer1.0-plugins-good-flac \
+	gstreamer1.0-plugins-good-flv \
+	gstreamer1.0-plugins-good-icydemux \
+	gstreamer1.0-plugins-good-id3demux \
+	gstreamer1.0-plugins-good-isomp4 \
+	gstreamer1.0-plugins-good-matroska \
+	gstreamer1.0-plugins-good-rtp \
+	gstreamer1.0-plugins-good-rtpmanager \
+	gstreamer1.0-plugins-good-rtsp \
+	gstreamer1.0-plugins-good-souphttpsrc \
+	gstreamer1.0-plugins-good-udp \
+	gstreamer1.0-plugins-good-wavparse \
+	gstreamer1.0-plugins-bad-faad \
+	gstreamer1.0-plugins-bad-fragmented \
+	gstreamer1.0-plugins-bad-videoparsersbad \
+	gstreamer1.0-plugins-bad-mms \
+	gstreamer1.0-plugins-bad-mpegpsdemux \
+	gstreamer1.0-plugins-bad-mpegtsdemux \
+	gstreamer1.0-plugins-ugly-asf \
+	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 \
+	gst-plugins-base-alsa \
+	gst-plugins-base-app \
+	gst-plugins-base-audioconvert \
+	gst-plugins-base-audioresample \
+	gst-plugins-base-decodebin \
+	gst-plugins-base-decodebin2 \
+	gst-plugins-base-ogg \
+	gst-plugins-base-playbin \
+	gst-plugins-base-subparse \
+	gst-plugins-base-typefindfunctions \
+	gst-plugins-base-vorbis \
+	gst-plugins-good-apetag \
+	gst-plugins-good-audioparsers \
+	gst-plugins-good-autodetect \
+	gst-plugins-good-avi \
+	gst-plugins-good-flac \
+	gst-plugins-good-flv \
+	gst-plugins-good-icydemux \
+	gst-plugins-good-id3demux \
+	gst-plugins-good-isomp4 \
+	gst-plugins-good-matroska \
+	gst-plugins-good-rtp \
+	gst-plugins-good-rtpmanager \
+	gst-plugins-good-rtsp \
+	gst-plugins-good-souphttpsrc \
+	gst-plugins-good-udp \
+	gst-plugins-good-wavparse \
+	gst-plugins-bad-cdxaparse \
+	gst-plugins-bad-faad \
+	gst-plugins-bad-mms \
+	gst-plugins-bad-mpegdemux \
+	gst-plugins-bad-vcdsrc \
+	gst-plugins-bad-fragmented \
+	gst-plugins-ugly-asf \
+	gst-plugins-ugly-cdio \
+	gst-plugins-ugly-dvdsub \
+	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
 # enigma2 and enigma2-plugins produce enigma2-plugin-*.
@@ -65,66 +197,72 @@ 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 "
+RDEPENDS_enigma2-plugin-extensions-streamtv = " \
+	librtmp \
+	${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-bad-rtmp", "gst-plugins-bad-rtmp", d)} \
+"
 
 DEPENDS += "djmount minidlna"
-RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna "
+RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna vuplus-dlnaserver"
 RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount kernel-module-fuse fuse-utils"
 
-DEPENDS += "opera-hbbtv"
-RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"
+DEPENDS += "${@base_contains("VUPLUS_FEATURES", "hbbtv", "opera-hbbtv" , "", d)}"
+RDEPENDS_enigma2-plugin-extensions-hbbtv = "${@base_contains("VUPLUS_FEATURES", "hbbtv", "opera-hbbtv" , "", d)}"
+
+DEPENDS += "${@base_contains("VUPLUS_FEATURES", "webkithbbtv", "webkit-hbbtv-browser" , "", d)}"
 
 DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data"
 RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams \
 	kernel-module-ppp-async kernel-module-ppp-deflate kernel-module-ppp-synctty kernel-module-ppp-generic kernel-module-usbserial \
+	vuplus-3gcommand \
 "
 
 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"
 
+RDEPENDS_enigma2-plugin-extensions-satipclient = "satipclient"
+
+DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
+RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libvugles2" , "", d)}"
+
 PN = "enigma2"
-PR = "r80"
+PR = "r139"
 
 inherit gitpkgv pythonnative
 
 ####################################################
-PV = "experimental-gitr${SRCPV}"
-PKGV = "experimental-gitr${GITPKGV}"
+SRCDATE = "20121128"
+PV = "experimental-git${SRCDATE}"
 BRANCH = "vuplus_experimental"
 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://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_mediaplayer_subtitle.patch \
 	file://enigma2_vuplus_remove_dreambox_enigma.patch \
 	file://enigma2_vuplus_vfd_mode.patch \
 	file://enigma2_vuplus_pluginbrowser.patch \
 	file://enigma2_vuplus_proc_oom_score_adj.patch \
         file://enigma2_vuplus_fix_standby_name.patch \
-        file://enigma2_vuplus_fix_standby_name_skin.patch \
-	file://enigma2_vuplus_epng.patch \
-	file://enigma2_vuplus_eptrlist_insert.patch \
-	file://enigma2_vuplus_conversion_error.patch \
-	file://enigma2_vuplus_default_arg_error.patch \
-	file://MyriadPro-Regular.otf \
-	file://MyriadPro-Semibold.otf \
-	file://MyriadPro-SemiboldIt.otf \
-	file://750S \
-	file://Vu_HD \
+	file://enigma2_vuplus_disable_subtitle_sync_mode_bug.patch \
+	file://spinner \
 	file://number_key \
 "
 
+SRC_URI_append = " ${@base_contains('GST_VERSION', '1.0', '', 'file://enablesubtitleshack.patch', d)}"
+
 SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", d)}"
 
+LDFLAGS_prepend = "${@base_contains('GST_VERSION', '1.0', ' -lxml2 ', '', d)}"
+
 def change_po():
     import os
     try:
@@ -165,29 +303,18 @@ do_configure_prepend() {
 }
 
 do_compile_prepend_vuplus() {
-	install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
-	install -m 0755 ${WORKDIR}/MyriadPro-Semibold.otf ${S}/data/fonts/
-	install -m 0755 ${WORKDIR}/MyriadPro-SemiboldIt.otf ${S}/data/fonts/
-	install -m 0755 ${WORKDIR}/750S/*.png ${S}/data/750S/
-	install -m 0755 ${WORKDIR}/750S/buttons/*.png ${S}/data/750S/buttons/
-	install -m 0755 ${WORKDIR}/750S/countries/*.png ${S}/data/750S/countries/
-	install -m 0755 ${WORKDIR}/750S/icons/*.png ${S}/data/750S/icons/
-	install -m 0755 ${WORKDIR}/750S/menu/*.png ${S}/data/750S/menu/
-	install -m 0755 ${WORKDIR}/750S/spinner/*.png ${S}/data/skin_default/spinner/
-	install -m 0755 ${WORKDIR}/Vu_HD/*.png ${S}/data/Vu_HD/
-	install -m 0755 ${WORKDIR}/Vu_HD/buttons/*.png ${S}/data/Vu_HD/buttons/
-	install -m 0755 ${WORKDIR}/Vu_HD/countries/*.png ${S}/data/Vu_HD/countries/
-	install -m 0755 ${WORKDIR}/Vu_HD/icons/*.png ${S}/data/Vu_HD/icons/
-	install -m 0755 ${WORKDIR}/Vu_HD/menu/*.png ${S}/data/Vu_HD/menu/
+	install -m 0755 ${WORKDIR}/spinner/*.png ${S}/data/skin_default/spinner/
 	install -m 0755 ${WORKDIR}/number_key/*.png ${S}/data/skin_default/buttons/
 }
 
 EXTRA_OECONF = " \
         --enable-dependency-tracking \
+	${@base_contains("GST_VERSION", "1.0", "--with-gstversion=1.0", "", d)} \
 	${@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)} \
 	${@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} \
@@ -202,3 +329,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"
+
+
+