remove testlab (is now provided by buildhistory)
authorhschang <chang@dev3>
Fri, 27 Dec 2013 08:06:13 +0000 (17:06 +0900)
committerhschang <chang@dev3>
Wed, 21 May 2014 04:41:50 +0000 (13:41 +0900)
remove old autotools.class
fix IndentationError

meta-openvuplus/classes/autotools.bbclass [deleted file]
meta-openvuplus/conf/distro/vuplus.conf
meta-openvuplus/recipes-multimedia/libdvdnav/libdvdnav_svn.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb

diff --git a/meta-openvuplus/classes/autotools.bbclass b/meta-openvuplus/classes/autotools.bbclass
deleted file mode 100644 (file)
index 658ae66..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-def autotools_dep_prepend(d):
-       if d.getVar('INHIBIT_AUTOTOOLS_DEPS', True):
-               return ''
-
-       pn = d.getVar('PN', True)
-       deps = ''
-
-       if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
-               return deps
-       deps += 'autoconf-native automake-native '
-
-       if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"):
-               deps += 'libtool-native '
-               if not bb.data.inherits_class('native', d) \
-                        and not bb.data.inherits_class('nativesdk', d) \
-                        and not bb.data.inherits_class('cross', d) \
-                        and not d.getVar('INHIBIT_DEFAULT_DEPS', True):
-                    deps += 'libtool-cross '
-
-       return deps + 'gnu-config-native '
-
-EXTRA_OEMAKE = ""
-
-DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
-
-inherit siteinfo
-
-# Space separated list of shell scripts with variables defined to supply test
-# results for autoconf tests we cannot run at build time.
-export CONFIG_SITE = "${@siteinfo_get_files(d)}"
-
-acpaths = "default"
-EXTRA_AUTORECONF = "--exclude=autopoint"
-
-export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
-
-def autotools_set_crosscompiling(d):
-       if not bb.data.inherits_class('native', d):
-               return " cross_compiling=yes"
-       return ""
-
-def append_libtool_sysroot(d):
-       # Only supply libtool sysroot option for non-native packages
-       if not bb.data.inherits_class('native', d):
-               return '--with-libtool-sysroot=${STAGING_DIR_HOST}'
-       return ""
-
-# EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
-
-CONFIGUREOPTS = " --build=${BUILD_SYS} \
-                 --host=${HOST_SYS} \
-                 --target=${TARGET_SYS} \
-                 --prefix=${prefix} \
-                 --exec_prefix=${exec_prefix} \
-                 --bindir=${bindir} \
-                 --sbindir=${sbindir} \
-                 --libexecdir=${libexecdir} \
-                 --datadir=${datadir} \
-                 --sysconfdir=${sysconfdir} \
-                 --sharedstatedir=${sharedstatedir} \
-                 --localstatedir=${localstatedir} \
-                 --libdir=${libdir} \
-                 --includedir=${includedir} \
-                 --oldincludedir=${oldincludedir} \
-                 --infodir=${infodir} \
-                 --mandir=${mandir} \
-                 --disable-silent-rules \
-                 ${CONFIGUREOPT_DEPTRACK} \
-                 ${@append_libtool_sysroot(d)}"
-CONFIGUREOPT_DEPTRACK = "--disable-dependency-tracking"
-
-
-oe_runconf () {
-       cfgscript="${S}/configure"
-       if [ -x "$cfgscript" ] ; then
-               bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
-               ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" || bbfatal "oe_runconf failed"
-       else
-               bbfatal "no configure script found at $cfgscript"
-       fi
-}
-
-AUTOTOOLS_AUXDIR ?= "${S}"
-
-autotools_do_configure() {
-       case ${PN} in
-       autoconf*)
-       ;;
-       automake*)
-       ;;
-       *)
-               # WARNING: gross hack follows:
-               # An autotools built package generally needs these scripts, however only
-               # automake or libtoolize actually install the current versions of them.
-               # This is a problem in builds that do not use libtool or automake, in the case
-               # where we -need- the latest version of these scripts.  e.g. running a build
-               # for a package whose autotools are old, on an x86_64 machine, which the old
-               # config.sub does not support.  Work around this by installing them manually
-               # regardless.
-               ( for ac in `find ${S} -name configure.in -o -name configure.ac`; do
-                       rm -f `dirname $ac`/configure
-                       done )
-               if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
-                       olddir=`pwd`
-                       cd ${S}
-                       # Remove any previous copy of the m4 macros
-                       rm -rf ${B}/aclocal-copy/
-                       if [ x"${acpaths}" = xdefault ]; then
-                               acpaths=
-                               for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
-                                       grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
-                                       acpaths="$acpaths -I $i"
-                               done
-                       else
-                               acpaths="${acpaths}"
-                       fi
-                       AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
-                       automake --version
-                       echo "AUTOV is $AUTOV"
-                       if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
-                               acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
-                       fi
-                       # The aclocal directory could get modified by other processes 
-                       # uninstalling data from the sysroot. See Yocto #861 for details.
-                       # We avoid this by taking a copy here and then files cannot disappear.
-                       if [ -d ${STAGING_DATADIR}/aclocal ]; then
-                               mkdir -p ${B}/aclocal-copy/
-                               # for scratch build this directory can be empty
-                               # so avoid cp's no files to copy error
-                               cp -r ${STAGING_DATADIR}/aclocal/. ${B}/aclocal-copy/
-                               acpaths="$acpaths -I ${B}/aclocal-copy/"
-                       fi
-                       # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
-                       # like it was auto-generated.  Work around this by blowing it away
-                       # by hand, unless the package specifically asked not to run aclocal.
-                       if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
-                               rm -f aclocal.m4
-                       fi
-                       if [ -e configure.in ]; then
-                         CONFIGURE_AC=configure.in
-                       else
-                         CONFIGURE_AC=configure.ac
-                       fi
-                       if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
-                         if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                           if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
-                             : do nothing -- we still have an old unmodified configure.ac
-                           else
-                             bbnote Executing glib-gettextize --force --copy
-                             echo "no" | glib-gettextize --force --copy
-                           fi
-                         else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                            # We'd call gettextize here if it wasn't so broken...
-                           cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
-                           if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
-                             cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
-                             if [ ! -e ${S}/po/remove-potcdate.sin ]; then
-                               cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/
-                             fi
-                            fi
-                         fi
-                       fi
-                       fi
-                       mkdir -p m4
-                       if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
-                         bbnote Executing intltoolize --copy --force --automake
-                         intltoolize --copy --force --automake
-                       fi
-                       bbnote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-                       autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
-                       cd $olddir
-               fi
-       ;;
-       esac
-       if [ -e ${S}/configure ]; then
-               oe_runconf
-       else
-               bbnote "nothing to configure"
-       fi
-}
-
-autotools_do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       # Info dir listing isn't interesting at this point so remove it if it exists.
-       if [ -e "${D}${infodir}/dir" ]; then
-               rm -f ${D}${infodir}/dir
-       fi
-}
-
-inherit siteconfig
-
-EXPORT_FUNCTIONS do_configure do_install
index 129303a..ad5d170 100644 (file)
@@ -5,7 +5,7 @@
 QA_LOG = "1"
 #USER_CLASSES += "image-prelink"
 SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
 QA_LOG = "1"
 #USER_CLASSES += "image-prelink"
 SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
-INHERIT += "buildhistory recipe_sanity testlab"
+INHERIT += "buildhistory recipe_sanity"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
index b00f742..d11cb45 100644 (file)
@@ -18,7 +18,7 @@ inherit autotools lib_package binconfig pkgconfig
 FILES_${PN} = "${libdir}/${PN}${SOLIB}"
 
 python populate_packages_prepend() {
 FILES_${PN} = "${libdir}/${PN}${SOLIB}"
 
 python populate_packages_prepend() {
-        description = bb.data.expand('${DESCRIPTION}', d)
-        libdir = bb.data.expand('${libdir}', d)
-        do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', description + ' (%s)', extra_depends='', allow_links=True)
+    description = bb.data.expand('${DESCRIPTION}', d)
+    libdir = bb.data.expand('${libdir}', d)
+    do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', description + ' (%s)', extra_depends='', allow_links=True)
 }
 }
index 390f696..458d1de 100644 (file)
@@ -26,31 +26,31 @@ do_install() {
 }
 
 python do_package_prepend () {
 }
 
 python do_package_prepend () {
-       boxtypes = [
-               ('bm750', 'duo.jpg', 'vu_normal.png'),
-               ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
-               ('vusolo', 'solo.jpg', 'vu_normal.png'),
-               ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
-               ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
-               ('vuuno', 'uno.jpg', 'vu_normal.png'),
-       ]
-       import os
-       top = '${D}${PLUGINPATH}/public/images/'
-       target_box = 'unknown.jpg'
-       target_remote = 'ow_remote.png'
-       for x in boxtypes:
-               if x[0] == '${MACHINE}':
-                       target_box = x[1]
-                       target_remote = x[2]
-                       break
-       for root, dirs, files in os.walk(top + 'boxes', topdown=False):
-               for name in files:
-                       if target_box != name and name != 'unknown.jpg':
-                               os.remove(os.path.join(root, name))
-       for root, dirs, files in os.walk(top + 'remotes', topdown=False):
-               for name in files:
-                       if target_remote != name and name != 'ow_remote.png':
-                               os.remove(os.path.join(root, name))
+    boxtypes = [
+        ('bm750', 'duo.jpg', 'vu_normal.png'),
+        ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
+        ('vusolo', 'solo.jpg', 'vu_normal.png'),
+        ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
+        ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
+        ('vuuno', 'uno.jpg', 'vu_normal.png'),
+    ]
+    import os
+    top = '${D}${PLUGINPATH}/public/images/'
+    target_box = 'unknown.jpg'
+    target_remote = 'ow_remote.png'
+    for x in boxtypes:
+        if x[0] == '${MACHINE}':
+            target_box = x[1]
+            target_remote = x[2]
+            break
+    for root, dirs, files in os.walk(top + 'boxes', topdown=False):
+        for name in files:
+            if target_box != name and name != 'unknown.jpg':
+                os.remove(os.path.join(root, name))
+    for root, dirs, files in os.walk(top + 'remotes', topdown=False):
+        for name in files:
+            if target_remote != name and name != 'ow_remote.png':
+                os.remove(os.path.join(root, name))
 }
 
 FILES_${PN} = "${PLUGINPATH}"
 }
 
 FILES_${PN} = "${PLUGINPATH}"
index d532eac..e50eccb 100755 (executable)
@@ -25,17 +25,18 @@ EXTRA_OECONF = " \
 "
 
 SRC_URI_append_vuplus = " \
 "
 
 SRC_URI_append_vuplus = " \
-          file://enigma2_plugins_mytube_tpm.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_20121113.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_webinterface_tpm.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_ac3lipsync_dolby.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_autoresolution_fix.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_fancontrol2.patch;patch=1;pnum=1 \
-          file://enigma2_plugins_gst_plugins_pkgname.patch;patch=1;pnum=1 \
-           file://dreamboxweb.png \
-           file://dreamboxwebtv.png \
-           file://favicon.ico \
-          file://Makefile.am "
+       file://enigma2_plugins_mytube_tpm.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_20121113.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_webinterface_tpm.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_ac3lipsync_dolby.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_autoresolution_fix.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_fancontrol2.patch;patch=1;pnum=1 \
+       file://enigma2_plugins_gst_plugins_pkgname.patch;patch=1;pnum=1 \
+       file://dreamboxweb.png \
+       file://dreamboxwebtv.png \
+       file://favicon.ico \
+       file://Makefile.am
+"
 
 FILES_${PN} += " /usr/share/enigma2 /usr/share/fonts "
 FILES_${PN}-meta = "${datadir}/meta"
 
 FILES_${PN} += " /usr/share/enigma2 /usr/share/fonts "
 FILES_${PN}-meta = "${datadir}/meta"
@@ -50,36 +51,36 @@ DEPENDS = "python-pyopenssl python-gdata streamripper python-mutagen python-daap
 DEPENDS += "enigma2"
 
 def modify_po():
 DEPENDS += "enigma2"
 
 def modify_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:
-                       changeword1(x)
-               changeword1('enigma2-plugins/networkwizard/src/networkwizard.xml ')
-               changeword2('enigma2-plugins/webinterface/src/web-data/tpl/default/index.html ')
-               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:
+            changeword1(x)
+        changeword1('enigma2-plugins/networkwizard/src/networkwizard.xml ')
+        changeword2('enigma2-plugins/webinterface/src/web-data/tpl/default/index.html ')
+        os.system('rm po_list')
+    except:
+        print 'word patch error '
+        return
 
 def changeword1(file):
 
 def changeword1(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)
 
 def changeword2(file):
 
 def changeword2(file):
-       fn = file[:-1]
-       fnn = file[:-1]+'_n'
-       cmd = "sed s/Dreambox/Vu+/g "+fn+" > "+fnn
-       os.system(cmd)
-       cmd1 = "mv "+fnn+" "+fn
-       os.system(cmd1)
+    fn = file[:-1]
+    fnn = file[:-1]+'_n'
+    cmd = "sed s/Dreambox/Vu+/g "+fn+" > "+fnn
+    os.system(cmd)
+    cmd1 = "mv "+fnn+" "+fn
+    os.system(cmd1)
 
 do_unpack_append(){
        modify_po()
 
 do_unpack_append(){
        modify_po()
@@ -96,30 +97,30 @@ do_install_append_vuplus() {
 }
 
 python populate_packages_prepend() {
 }
 
 python populate_packages_prepend() {
-        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
-        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)', '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)
-        def parseControlFile(dir, d, package):
-                import os
-               #ac3lipsync is renamed since 20091121 to audiosync.. but rename in cvs is not possible without lost of revision history..
-               #so the foldername is still ac3lipsync
-               if package == 'audiosync':
-                       package = 'ac3lipsync'
-                src = open(dir + "/" + package.split('-')[-1] + "/CONTROL/control").read()
-                for line in src.splitlines():
-                        name, value = line.strip().split(': ', 1)
-                        if name == 'Description':
-                                d.setVar('DESCRIPTION_' + package, value)
-                        elif name == 'Depends':
-                                d.setVar('RDEPENDS_' + package, ' '.join(value.split(', ')))
-                        elif name == 'Replaces':
-                                d.setVar('RREPLACES_' + package, ' '.join(value.split(', ')))
-                        elif name == 'Conflicts':
-                                d.setVar('RCONFLICTS_' + package, ' '.join(value.split(', ')))
-        srcdir = d.getVar('S', True)
-        for package in d.getVar('PACKAGES', True).split():
-                if package.startswith('enigma2-plugin-') and not package.endswith('-dev') and not package.endswith('-dbg') and not package.endswith('-staticdev'):
-                        parseControlFile(srcdir, d, package)
+    enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)', '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)
+    def parseControlFile(dir, d, package):
+        import os
+        #ac3lipsync is renamed since 20091121 to audiosync.. but rename in cvs is not possible without lost of revision history..
+        #so the foldername is still ac3lipsync
+        if package == 'audiosync':
+            package = 'ac3lipsync'
+        src = open(dir + "/" + package.split('-')[-1] + "/CONTROL/control").read()
+        for line in src.splitlines():
+            name, value = line.strip().split(': ', 1)
+            if name == 'Description':
+                d.setVar('DESCRIPTION_' + package, value)
+            elif name == 'Depends':
+                d.setVar('RDEPENDS_' + package, ' '.join(value.split(', ')))
+            elif name == 'Replaces':
+                d.setVar('RREPLACES_' + package, ' '.join(value.split(', ')))
+            elif name == 'Conflicts':
+                d.setVar('RCONFLICTS_' + package, ' '.join(value.split(', ')))
+    srcdir = d.getVar('S', True)
+    for package in d.getVar('PACKAGES', True).split():
+        if package.startswith('enigma2-plugin-') and not package.endswith('-dev') and not package.endswith('-dbg') and not package.endswith('-staticdev'):
+            parseControlFile(srcdir, d, package)
 }
 }
index f224870..6b9fd0d 100755 (executable)
@@ -24,17 +24,17 @@ inherit autotools
 S = "${WORKDIR}/git"
 
 python populate_packages_prepend () {
 S = "${WORKDIR}/git"
 
 python populate_packages_prepend () {
-       enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
+    enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
 
 
-       do_split_packages(d, enigma2_skindir, '(.*?)/.*', 'enigma2-skin-%s', 'Enigma2 Skin: %s', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_skindir, '(.*?)/.*', 'enigma2-skin-%s', 'Enigma2 Skin: %s', recursive=True, match_path=True, prepend=True)
 }
 
 python populate_packages_append () {
 }
 
 python populate_packages_append () {
-       enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
+    enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
 
 
-       #clear rdepends by default
-       for package in bb.data.getVar('PACKAGES', d, 1).split():
-               bb.data.setVar('RDEPENDS_' + package, '', d)
+    #clear rdepends by default
+    for package in bb.data.getVar('PACKAGES', d, 1).split():
+        bb.data.setVar('RDEPENDS_' + package, '', d)
 
 
-       #todo add support for control files in skindir.. like plugins
+    #todo add support for control files in skindir.. like plugins
 }
 }
index df97203..66b8378 100644 (file)
@@ -3,32 +3,32 @@ MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3"
 DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
 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 \
+           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 \
 "
 
 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 \
+               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 \
 "
 
 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} \
+                  python-xml python-fcntl python-stringold python-pickle python-netclient \
+                  glibc-gconv-iso8859-15 ethtool parted \
+                  ${RDEPENDS_GST} \
 "
 
 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_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"
 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"
@@ -108,11 +108,11 @@ SRCREV = ""
 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 \
 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_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_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_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://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
            file://enigma2_vuplus_fix_standby_name.patch \
            file://enigma2_vuplus_fix_standby_name_skin.patch \
@@ -122,34 +122,34 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
            file://750S \
            file://Vu_HD \
            file://number_key \
            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)}"
 
 def change_po():
 
 SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", 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):
 
 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(){
 
 do_unpack_append(){
-        change_po()
+       change_po()
 }
 
 S = "${WORKDIR}/git"
 }
 
 S = "${WORKDIR}/git"
@@ -166,21 +166,21 @@ do_configure_prepend() {
 }
 
 do_compile_prepend_vuplus() {
 }
 
 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 = " \
 }
 
 EXTRA_OECONF = " \
@@ -188,18 +188,18 @@ 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", "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() {
 "
 
 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"
 }
 
 RCONFLICTS_${PN} = "dreambox-keymaps"