From: hschang <chang@dev3>
Date: Thu, 12 Mar 2015 04:33:39 +0000 (+0900)
Subject: Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=d5ed73c8eb69b1df41a91be4c5a92fd8881eade9;hp=-c

Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next

Conflicts:
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
---

d5ed73c8eb69b1df41a91be4c5a92fd8881eade9
diff --combined meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
index 0000000,710c9ca..dcc6852
mode 000000,100644..100644
--- a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
@@@ -1,0 -1,45 +1,42 @@@
+ DESCRIPTION = "Hardware drivers and blindscan util for Vuplus Tuner Turbo"
+ SECTION = "base"
+ LICENSE = "CLOSED"
+ 
+ SRCDATE = "20150303"
+ FW_SRCDATE = "20150303"
+ KV = "${VUPLUS_KERNEL_VERSION}"
+ PV = "${KV}"
+ PR = "${SRCDATE}"
+ 
+ SRC_URI = " \
+     	http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_driver_${PV}_${SRCDATE}.tar.gz;name=driver \
+     	http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_bin_fw_${FW_SRCDATE}.tar.gz;name=binfw \
+ "
+ 
 -DEPENDS += "virtual/kernel module-init-tools"
 -RDEPENDS_${PN} += "module-init-tools-depmod"
 -
+ S = "${WORKDIR}"
+ 
+ inherit module-base
+ 
+ do_install() {
+         install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus
+ 	install -m 0644 ${S}/vuplus_tuner_turbo_driver.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus/vuplus_tuner_turbo_driver.ko
+ 	install -d ${D}/lib/firmware/
+ 	install -m 0644 ${S}/Vuplus_Turbo_USB_0101.fw ${D}/lib/firmware/Vuplus_Turbo_USB_0101.fw
+ 	install -d "${D}/${bindir}"
+ 	install -m 0755 "${S}/vuplus_turbo_c" "${D}/${bindir}"
+ 	install -m 0755 "${S}/vuplus_turbo_t" "${D}/${bindir}"
+ }
+ 
+ pkg_postinst_${PN} () {
+         if [ -d /proc/stb ]; then
+                 depmod -a
+         fi
+         true
+ }
+ 
+ PACKAGE_ARCH := "${MACHINE_ARCH}"
+ FILES_${PN} = "/"
+ 
+ SRC_URI[binfw.md5sum] = "517a9d54e41fae16612bcfe431ef7a3e"
+ SRC_URI[binfw.sha256sum] = "b39f0b38684c44a13dd62ac4286a4a73bcf74fd25a881ecfe97d292535163ca0"
+ 
diff --combined meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dfc5fd2,67e6039..ff2530c
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,10 -1,10 +1,10 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7424.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
- SRC_URI[md5sum] = "53e47f210025250f95b314c8deb83302"
- SRC_URI[sha256sum] = "9775def1dfb10ed5856ba53787c337878608e16180cf1470a2e1d897b59f5d53"
+ SRC_URI[md5sum] = "9633342a561268a08509e636e832fd9f"
+ SRC_URI[sha256sum] = "4ae626ecd7be77f913a246e550325868330725cfd5666af4755d9ea887cf9165"
diff --combined meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dac3ac2,d47f2d4..bf3094a
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,10 -1,10 +1,10 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7356.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
  
- SRC_URI[md5sum] = "5ebb1c74553b836b22a41ef485b46e27"
- SRC_URI[sha256sum] = "598747ddf461ef6cd43bffd246427251d2338da040240e15602b8e72c0735369"
+ SRC_URI[md5sum] = "9d3c926e9452e0ed922b7cd4f3d8bdb9"
+ SRC_URI[sha256sum] = "ab684371e5fdf365d19ac602e903c5f355d09fcd595814b13cb54118a4bf129e"
diff --combined meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
index d8045c4,0336754..9392dcd
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@@ -1,9 -1,9 +1,9 @@@
- SRCDATE = "20150113"
+ SRCDATE = "20150302"
  SRCDATE_PR = "r0"
  
 -do_install_append(){
 -  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 +pkg_postinst_${PN}_append () {
 +  ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
  }
  
- SRC_URI[md5sum] = "af6a79ba8c1df1b6c502c5891ace8186"
- SRC_URI[sha256sum] = "fb8e7ad8d2116f8f01b36e11c60d42fcd966d76211499b8810b1784caa8f901e"
+ SRC_URI[md5sum] = "73e636c13d545a7421055adecdff0efa"
+ SRC_URI[sha256sum] = "0548027af76eeda4c2b8ae4e178115b89d3188a8d19362d3f132358aa01f8cc8"
diff --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 71525f1,635c224..7464f06
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -1,140 -1,37 +1,140 @@@
  DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions"
 -MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 +MAINTAINER = "vuplus team"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3"
 -DEPENDS = "jpeg libungif 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 \
 -"
  
 -RDEPENDS_GST= "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-bad-faad \
 -"
 +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 \
 +	"
  
 -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 \
 -		${RDEPENDS_GST} \
 -"
 +RDEPENDS_${PN} = " \
 +	alsa-conf \
 +        ethtool \
 +	glibc-gconv-iso8859-15 \
 +        parted \
 +	${PYTHON_RDEPS} \
 +	${GST_RDEPENDS} \
 +	"
  
 -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}"
 +PYTHON_RDEPS = " \
 +        python-codecs \
 +        python-core \
 +        python-lang \
 +        python-re \
 +        python-threading \
 +        python-xml \
 +        python-fcntl \
 +        python-stringold \
 +        python-pickle \
 +        python-netclient \
 +	"
  
 -RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugins-good-avi"
 +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-*.
@@@ -169,12 -66,9 +169,12 @@@ SUMMARY_enigma2-plugin-systemplugins-ne
  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 = " \
 +	librtmp1 \
 +	${@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 "
@@@ -195,75 -89,70 +195,75 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 -RDEPENDS_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 +RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
  
  PN = "enigma2"
- PR = "r100"
 -PR = "r97"
++PR = "r101"
  
 -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
 +inherit gitpkgv pythonnative
  
  ####################################################
 -BRANCH = "vuplus_experimental"
 +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} \
 -           file://enigma2_vuplus_skin.patch;patch=1;pnum=1 \
 -           file://enigma2_vuplus_mediaplayer.patch;patch=1;pnum=1 \
 -	   file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \
 -           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_vuplus_pluginbrowser.patch;striplevel=1 \
 -           file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
 -           file://enigma2_vuplus_fix_standby_name.patch \
 -           file://enigma2_vuplus_fix_standby_name_skin.patch \
 -           file://MyriadPro-Regular.otf \
 -           file://MyriadPro-Semibold.otf \
 -           file://MyriadPro-SemiboldIt.otf \
 -           file://750S \
 -           file://Vu_HD \
 -           file://number_key \
 -           "
 -
 -SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
 +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 \
 +	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://enigma2_vuplus_wrong_boolean_type.patch \
 +	file://enigma2_vuplus_disable_subtitle_sync_mode_bug.patch \
 +	file://MyriadPro-Regular.otf \
 +	file://MyriadPro-Semibold.otf \
 +	file://MyriadPro-SemiboldIt.otf \
 +	file://750S \
 +	file://Vu_HD \
 +	file://number_key \
 +"
 +
 +SRC_URI_append = " ${@base_contains('GST_VERSION', '1.0', '', 'file://enbalesubtitleshack.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:
 -                os.system("find ./ -name \"*.po\" > ./po_list")
 -                os.system("find ./ -name \"*.pot\" >> ./po_list")
 -                po_list = []
 -                po_list = open('po_list','r+').readlines()
 -                for x in po_list:
 -                        changeword(x)
 -                os.system('rm po_list')
 -        except:
 -                print 'word patch error '
 -                return
 +    import os
 +    try:
 +        os.system("find ./ -name \"*.po\" > ./po_list")
 +        os.system("find ./ -name \"*.pot\" >> ./po_list")
 +        po_list = []
 +        po_list = open('po_list','r+').readlines()
 +        for x in po_list:
 +            changeword(x)
 +        os.system('rm po_list')
 +    except:
 +        print 'word patch error '
 +        return
  
  def changeword(file):
 -        fn = file[:-1]
 -        fnn = file[:-1]+'_n'
 -        cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
 -        os.system(cmd)
 -        cmd1 = "mv "+fnn+" "+fn
 -        os.system(cmd1)
 +    fn = file[:-1]
 +    fnn = file[:-1]+'_n'
 +    cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
 +    os.system(cmd)
 +    cmd1 = "mv "+fnn+" "+fn
 +    os.system(cmd1)
  
  do_unpack_append(){
 -        change_po()
 +    change_po()
  }
  
  S = "${WORKDIR}/git"
@@@ -273,49 -162,50 +273,49 @@@ FILES_${PN}-meta = "${datadir}/meta
  PACKAGES += "${PN}-meta"
  PACKAGE_ARCH = "${MACHINE_ARCH}"
  
 -inherit autotools pkgconfig
 +inherit autotools-brokensep pkgconfig pythonnative
  
  do_configure_prepend() {
  	git checkout ${BRANCH}
  }
  
  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}/number_key/*.png ${S}/data/skin_default/buttons/
 +	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}/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} \
 -        STAGING_LIBDIR=${STAGING_LIBDIR} \
 +	BUILD_SYS=${BUILD_SYS} \
 +	HOST_SYS=${HOST_SYS} \
 +	STAGING_INCDIR=${STAGING_INCDIR} \
 +	STAGING_LIBDIR=${STAGING_LIBDIR} \
  "
  
  python populate_packages_prepend() {
 -        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
 -        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 +    enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
 +    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
  }
  
 -RCONFLICTS_${PN} = "dreambox-keymaps"
 -RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)"
 -
diff --combined meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
index ca6c040,0000000..4daa4d7
mode 100644,000000..100644
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
@@@ -1,239 -1,0 +1,240 @@@
 +SUMMARY = "Vuplus: Essential packages"
 +SECTION = "vuplus/base"
 +LICENSE = "MIT"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 +DEPENDS = "virtual/kernel"
 +
 +RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 +RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
 +RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}'
 +
- PR = "r7"
++PR = "r8"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +inherit packagegroup
 +
 +ESSENTIAL_RDEPENDS = " \
++	vuplus-tuner-turbo \
 +"
 +
 +KERNEL_FS_MODULES = " \
 +        kernel-module-ext2 \
 +        kernel-module-ext4 \
 +        kernel-module-autofs4 \
 +        kernel-module-cifs \
 +        kernel-module-msdos \
 +        kernel-module-udf \
 +        kernel-module-isofs \
 +        kernel-module-nls-cp850 \
 +"
 +
 +ESSENTIAL_RRECOMMENDS = " \
 +        kernel-module-cdrom \
 +        kernel-module-sr-mod \
 +	${KERNEL_FS_MODULES} \
 +"
 +
 +DVB_USB_V1 = " \
 +  kernel-module-dvb-usb \
 +  kernel-module-dvb-usb-a800 \
 +  kernel-module-dvb-usb-dibusb-common \
 +  kernel-module-dvb-usb-dibusb-mb \
 +  kernel-module-dvb-usb-dibusb-mc \
 +  kernel-module-dvb-usb-dib0700 \
 +  kernel-module-dvb-usb-umt-010 \
 +  kernel-module-dvb-usb-cxusb \
 +  kernel-module-dvb-usb-m920x \
 +  kernel-module-dvb-usb-digitv \
 +  kernel-module-dvb-usb-vp7045 \
 +  kernel-module-dvb-usb-vp702x \
 +  kernel-module-dvb-usb-gp8psk \
 +  kernel-module-dvb-usb-nova-t-usb2 \
 +  kernel-module-dvb-usb-ttusb2 \
 +  kernel-module-dvb-usb-dtt200u \
 +  kernel-module-dvb-usb-opera \
 +  kernel-module-dvb-usb-af9005 \
 +  kernel-module-dvb-usb-af9005-remote \
 +  kernel-module-dvb-usb-pctv452e \
 +  kernel-module-dvb-usb-dw2102 \
 +  kernel-module-dvb-usb-cinergyt2 \
 +  kernel-module-dvb-usb-dtv5100 \
 +  kernel-module-dvb-usb-friio \
 +  kernel-module-dvb-usb-az6027 \
 +  kernel-module-dvb-usb-technisat-usb2 \
 +"
 +
 +DVB_USB_V2 = " \
 +  kernel-module-dvb-usb-v2 \
 +  kernel-module-dvb-usb-af9015 \
 +  kernel-module-dvb-usb-af9035 \
 +  kernel-module-dvb-usb-anysee \
 +  kernel-module-dvb-usb-au6610 \
 +  kernel-module-dvb-usb-az6007 \
 +  kernel-module-dvb-usb-ce6230 \
 +  kernel-module-dvb-usb-ec168 \
 +  kernel-module-dvb-usb-gl861 \
 +  kernel-module-dvb-usb-it913x \
 +  kernel-module-dvb-usb-lmedm04 \
 +  kernel-module-dvb-usb-mxl111sf \
 +  kernel-module-mxl111sf-demod \
 +  kernel-module-mxl111sf-tuner \
 +  kernel-module-dvb-usb-rtl28xxu \
 +"
 +
 +KERNEL_MEDIA_ANALOG_USB_ADAPTERS = " \
 +  kernel-module-pvrusb2 \
 +  kernel-module-hdpvr \
 +  kernel-module-usbvision \
 +  kernel-module-stk1160 \
 +  kernel-module-poseidon \
 +"
 +
 +KERNEL_MEDIA_ANALOG_DIGITAL_USB_ADAPTERS = " \
 +  kernel-module-au0828 \
 +  kernel-module-cx231xx \
 +  kernel-module-tm6000 \
 +  kernel-module-em28xx \
 +"
 +
 +KERNEL_MEDIA_USB_ADAPTERS = " \
 +  kernel-module-au0828 \
 +  ${DVB_USB_V1} \
 +  ${DVB_USB_V2} \
 +  kernel-module-dvb-ttusb-budget \
 +  kernel-module-smsusb \
 +  kernel-module-smsdvb \
 +  kernel-module-smsmdtv \
 +  kernel-module-b2c2-flexcop \
 +  kernel-module-b2c2-flexcop-usb \
 +  kernel-module-tveeprom \
 +  kernel-module-cypress-firmware \
 +  kernel-module-dvb-usb-cypress-firmware \
 +  ${KERNEL_MEDIA_ANALOG_USB_ADAPTERS} \
 +  ${KERNEL_MEDIA_ANALOG_DIGITAL_USB_ADAPTERS} \
 +"
 +
 +KERNEL_MEDIA_CUSTOMIZE_TV_TUNER = " \
 +  kernel-module-tuner-simple \
 +  kernel-module-tuner-types \
 +  kernel-module-tda8290 \
 +  kernel-module-tda827x \
 +  kernel-module-tda18271 \
 +  kernel-module-tda9887 \
 +  kernel-module-tea5761 \
 +  kernel-module-tea5767 \
 +  kernel-module-mt20xx \
 +  kernel-module-mt2060 \
 +  kernel-module-mt2063 \
 +  kernel-module-mt2266 \
 +  kernel-module-mt2131 \
 +  kernel-module-qt1010 \
 +  kernel-module-tuner-xc2028 \
 +  kernel-module-xc5000 \
 +  kernel-module-xc4000 \
 +  kernel-module-mxl5005s \
 +  kernel-module-mxl5007t \
 +  kernel-module-mc44s803 \
 +  kernel-module-max2165 \
 +  kernel-module-tda18218 \
 +  kernel-module-fc0011 \
 +  kernel-module-fc0012 \
 +  kernel-module-fc0013 \
 +  kernel-module-tda18212 \
 +  kernel-module-e4000 \
 +  kernel-module-fc2580 \
 +  kernel-module-tua9001 \
 +  kernel-module-tuner-it913x \
 +  kernel-module-r820t \
 +"
 +
 +KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS = " \
 +  kernel-module-stb0899 \
 +  kernel-module-stb6100 \
 +  kernel-module-stv090x \
 +  kernel-module-stv6110x \
 +  kernel-module-drxk \
 +  kernel-module-tda18271c2dd \
 +  kernel-module-cx24110 \
 +  kernel-module-cx24123 \
 +  kernel-module-mt312 \
 +  kernel-module-zl10036 \
 +  kernel-module-zl10039 \
 +  kernel-module-s5h1420 \
 +  kernel-module-stv0288 \
 +  kernel-module-stb6000 \
 +  kernel-module-stv0299 \
 +  kernel-module-stv6110 \
 +  kernel-module-stv6110x \
 +  kernel-module-stv0900 \
 +  kernel-module-tda8083 \
 +  kernel-module-tda10086 \
 +  kernel-module-tda8261 \
 +  kernel-module-ves1x93 \
 +  kernel-module-itd1000 \
 +  kernel-module-cx24113 \
 +  kernel-module-tda826x \
 +  kernel-module-tua6100 \
 +  kernel-module-cx24116 \
 +  kernel-module-cx24117 \
 +  kernel-module-si21xx \
 +  kernel-module-ts2020 \
 +  kernel-module-ds3000 \
 +  kernel-module-mb86a16 \
 +  kernel-module-tda10071 \
 +  kernel-module-sp8870 \
 +  kernel-module-sp887x \
 +  kernel-module-cx22700 \
 +  kernel-module-cx22702 \
 +  kernel-module-s5h1432 \
 +  kernel-module-drxd \
 +  kernel-module-l64781 \
 +  kernel-module-tda1004x \
 +  kernel-module-nxt6000 \
 +  kernel-module-mt352 \
 +  kernel-module-zl10353 \
 +  kernel-module-dib3000mb \
 +  kernel-module-dib3000mc \
 +  kernel-module-dib7000m \
 +  kernel-module-dib7000p \
 +  kernel-module-dib9000 \
 +  kernel-module-tda10048 \
 +  kernel-module-af9013 \
 +  kernel-module-ec100 \
 +  kernel-module-hd29l2 \
 +  kernel-module-stv0367 \
 +  kernel-module-cxd2820r \
 +  kernel-module-rtl2830 \
 +  kernel-module-rtl2832 \
 +  kernel-module-ves1820 \
 +  kernel-module-tda10021 \
 +  kernel-module-tda10023 \
 +  kernel-module-stv0297 \
 +  kernel-module-s921 \
 +  kernel-module-dib8000 \
 +  kernel-module-mb86a20s \
 +  kernel-module-dvb-pll \
 +  kernel-module-dib0070 \
 +  kernel-module-dib0090 \
 +  kernel-module-lnbp21 \
 +  kernel-module-lnbp22 \
 +  kernel-module-isl6405 \
 +  kernel-module-isl6421 \
 +  kernel-module-isl6423 \
 +  kernel-module-a8293 \
 +  kernel-module-lgs8gl5 \
 +  kernel-module-lgs8gxx \
 +  kernel-module-atbm8830 \
 +  kernel-module-tda665x \
 +  kernel-module-ix2505v \
 +  kernel-module-it913x-fe \
 +  kernel-module-m88rs2000 \
 +  kernel-module-af9033 \
 +"
 +
 +KERNEL_DVB_MODULES = " \
 +  ${KERNEL_MEDIA_USB_ADAPTERS} \
 +  ${KERNEL_MEDIA_CUSTOMIZE_TV_TUNER} \
 +  ${KERNEL_MEDIA_CUSTOMIZE_DVB_FRONTENDS} \
 +"
 +
diff --combined meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 10f4e56,7e126b5..397423e
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
@@@ -1,22 -1,19 +1,23 @@@
  DESCIPTION = "helper tool to use usb dvb frontends"
  MAINTAINER = "PLi team"
  LICENSE = "GPLv2"
 -LIC_FILES_CHKSUM = "file://${THISDIR}/${PN}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
  
  PV = "1.0+git${SRCPV}"
- PR = "r3"
+ PR = "r4"
  SRC_REV = ""
  
  SRC_URI = " \
  	git://code.vuplus.com/git/vtuner.git;protocol=git;tag=${SRC_REV} \
  	file://no_usb_device.patch;striplevel=1 \
+ 	file://fix_set_delsys.patch \
  	file://${PN}.sh \
  	"
  
 +do_configure_prepend() {
 +        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
 +}
 +
  S = "${WORKDIR}/git"
  
  inherit autotools update-rc.d