From: hschang <chang@dev3>
Date: Fri, 21 Nov 2014 05:08:01 +0000 (+0900)
Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=89fe5e2d4ab32d17585aaf80418c7d31ed559a14;hp=-c

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

Conflicts:
	meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
---

89fe5e2d4ab32d17585aaf80418c7d31ed559a14
diff --combined meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index c55df2f,275d475..95909d0
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@@ -6,7 -6,7 +6,7 @@@ LIC_FILES_CHKSUM = "file://README;first
  DEPENDS = "python-cheetah-native"
  RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
  
 -inherit gitpkgv
 +inherit gitpkgv pythonnative
  PV = "0.1+git${SRCPV}"
  PKGV = "0.1+git${GITPKGV}"
  PR = "r0.82"
@@@ -26,32 -26,33 +26,33 @@@ do_install() 
  }
  
  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'),
 -		('vusolose', 'solose.jpg', 'vu_normal.png'),
 -		('vuzero', 'zero.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'),
 +        ('vusolose', 'solose.jpg', 'vu_normal.png'),
++        ('vuzero', 'zero.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}"
diff --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index c35ccc7,3ce6e87..1a7ec06
--- a/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 = "r82"
+ PR = "r90"
  
 -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/tuxbox/tuxbox-common.bb
index 1a9c266,f5477de..e6a4f37
--- a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
@@@ -4,9 -4,9 +4,9 @@@ LIC_FILES_CHKSUM = "file://${COREBASE}/
  MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
  
  PN = "tuxbox-common"
- PR = "r5"
+ PR = "r6"
  
 -SRC_REV = "HEAD"
 +SRC_REV = "12436bfb31dafdc4c73bc4bb5d4cb39a0855c95e"
  
  SRC_URI = "git://code.vuplus.com/git/dvbapp-meta.git;protocol=git;tag=${SRC_REV} "
  
diff --combined meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
index 8a58b99,ff40cde..8140269
--- a/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
+++ b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
@@@ -4,7 -4,7 +4,7 @@@ LICENSE = "CLOSED
  
  
  PV = "1.0"
- PR = "r2"
+ PR = "r3"
  SRC_REV = ""
  
  SRC_URI = "file://coldboot \
@@@ -20,8 -20,6 +20,8 @@@ do_install() 
  	install -m 0755 ${WORKDIR}/coldboot.sh ${D}/etc/init.d/coldboot.sh
  	install -m 0755 ${WORKDIR}/ethwol.sh ${D}/etc/init.d/ethwol.sh
  	install -m 0755 ${WORKDIR}/coldboot ${D}/usr/bin/coldboot
-         ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S30coldboot.sh
+         ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S50coldboot.sh
          ln -sf   ../init.d/ethwol.sh ${D}${sysconfdir}/rc0.d/K32ethwol.sh
  }
 +
 +INHIBIT_PACKAGE_STRIP = "1"