Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

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

diff --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index b364ec6,d6ff47f..c35ccc7
--- 1/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
--- 2/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -1,36 -1,37 +1,36 @@@
  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 \
 +
 +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 \
  "
  
 -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 \
 -"
 -
 -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} \
 +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 \
  "
  
  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_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}"
  
 -RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugins-good-avi"
 +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} \
 +"
  
  # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
  # enigma2 and enigma2-plugins produce enigma2-plugin-*.
@@@ -88,67 -89,67 +88,67 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r80"
+ PR = "r82"
  
 -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
  
  ####################################################
 +PV = "experimental-gitr${SRCPV}"
 +PKGV = "experimental-gitr${GITPKGV}"
  BRANCH = "vuplus_experimental"
 -PV = "experimental-git${SRCDATE}"
  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)}"
 +      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://number_key \
 +"
 +
 +SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", 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"
@@@ -158,47 -159,49 +158,47 @@@ 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("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)} \
 -        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/opera-hbbtv/opera-hbbtv_0.2.bb
index 42766a5,286bf22..54a9610
--- 1/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
--- 2/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "required
  LICENSE = "CLOSED"
  
  DEPENDS = "mpfr gmp"
 -RDEPENDS = "sysfsutils vuplus-dvb-modules"
 +RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
  
- SRC_DATE = "20140721_0"
+ SRC_DATE = "20140725_0"
  
  PR = "r1_${SRC_DATE}"
  SRC_URI = ""
@@@ -58,10 -58,10 +58,10 @@@ do_install() 
  }
  
  package_do_shlibs_append() {
 -      deps = "${PKGDEST}/${PN}.shlibdeps"
 -      tmp = "/tmp/.${PN}.shlibdeps"
 -      os.system("sed -e '/vbrowser/d' %s > %s" % (deps, tmp))
 -      os.system("cp %s %s" % (tmp, deps))
 +    deps = "${PKGDEST}/${PN}.shlibdeps"
 +    tmp = "/tmp/.${PN}.shlibdeps"
 +    os.system("sed -e '/vbrowser/d' %s > %s" % (deps, tmp))
 +    os.system("cp %s %s" % (tmp, deps))
  }
  
  do_package_qa() {
@@@ -74,6 -74,6 +74,6 @@@ PACKAGES = "${PN}
  
  FILES_${PN} = "/"
  
- SRC_URI[md5sum] = "a47c373ab7f132c388bc3f74891fc80a"
- SRC_URI[sha256sum] = "81a6285dde9809a9d6c4b4dfd67bd4b09b54d01ba24fc82688509c3bda595b33"
+ SRC_URI[md5sum] = "1ba7691c826856431c0dba1d4251f32e"
+ SRC_URI[sha256sum] = "0bc932152a3eda86c3e871a87ea58e0a8693aa707b93c8cf174c29663ec00d5c"
  

diff --combined meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
index e0b9538,0000000..20caccc
mode 100644,000000..100644
--- 1/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
@@@ -1,73 -1,0 +1,73 @@@
- PR = "r1"
 +SUMMARY = "Enigma2 set of packages for Vuplus"
 +SECTION = "vuplus/base"
 +LICENSE = "GPLv2"
 +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
++PR = "r2"
 +
 +inherit packagegroup
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +
 +RDEPENDS_${PN} += " \
 +  enigma2 \
 +  enigma2-defaultservices \
 +  enigma2-streamproxy \
 +  tuxbox-tuxtxt-32bpp \
 +  showiframe \
 +  enigma2-meta \
 +  enigma2-plugins-meta \
 +  enigma2-skins-meta \
 +  enigma2-plugin-extensions-mediascanner \
 +  enigma2-plugin-systemplugins-crashreport \
 +  enigma2-plugin-extensions-remotestreamconvert \
 +  enigma2-plugin-systemplugins-zappingmodeselection \
 +  enigma2-plugin-extensions-addstreamurl \
 +  enigma2-plugin-systemplugins-devicemanager \
 +  enigma2-plugin-systemplugins-videomode \
 +  enigma2-plugin-systemplugins-netdrive \
 +"
 +
 +RRECOMMENDS_${PN} += " \
 +  glib-networking \
 +  dvbsnoop \
 +"
 +
 +RDEPENDS_${PN} += " \
 +  aio-grab \
 +  python-misc python-shell python-ctypes \
 +  python-crypt \
 +  python-netserver \
 +  python-twisted-core \
 +  python-twisted-protocols \
 +  python-twisted-web \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "packagegroup-vuplus-wlan", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
 +  enigma2-plugin-extensions-mediaplayer \
 +  enigma2-plugin-extensions-pictureplayer \
 +  enigma2-plugin-systemplugins-skinselector \
 +  enigma2-plugin-systemplugins-ui3dsetup \
 +  enigma2-plugin-systemplugins-uipositionsetup \
 +  enigma2-plugin-systemplugins-hdmicec \
 +  enigma2-plugin-extensions-openwebif \
 +  ${@base_contains("MACHINE_FEATURES", "wifi", "enigma2-plugin-systemplugins-wirelessaccesspoint", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_simple", "enigma2-plugin-systemplugins-fancontrol","", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fan_manual", "enigma2-plugin-systemplugins-manualfancontrol", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "rc_code", "enigma2-plugin-systemplugins-remotecontrolcode", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "led", "enigma2-plugin-systemplugins-ledbrightnesssetup", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan  vuplus-blindscan-utils", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "autoshutdown", "enigma2-plugin-systemplugins-autoshutdown", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "transcoding", "enigma2-plugin-systemplugins-transcodingsetup enigma2-transtreamproxy", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "wol", "enigma2-plugin-systemplugins-wolsetup", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "duo2lcd4linux lcd4linuxsupport", "", d)} \
 +  ${@base_conditional("MACHINE", "vuduo2", "vuplus-checkvfd", "", d)} \
 +  ${@base_contains("VUPLUS_FEATURES", "audioeffect", "enigma2-plugin-systemplugins-audioeffect", "", d)} \
 +"
 +
 +PACKAGE_ARCH = "${MACHINE_ARCH}"
 +