diff --git a/meta-brands/meta-ini/conf/machine/include/ini-oem.inc b/meta-brands/meta-ini/conf/machine/include/ini-oem.inc index f59f8f870a3..cfdf5e36513 100644 --- a/meta-brands/meta-ini/conf/machine/include/ini-oem.inc +++ b/meta-brands/meta-ini/conf/machine/include/ini-oem.inc @@ -9,6 +9,7 @@ ${@base_contains('MACHINEBUILD', 'sezam1000hd', '1000-HD' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezam5000hd', '5000-HD' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezammarvel', 'Marvel' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx', 'LX-x' , '', d)}\ +${@base_contains('MACHINEBUILD', 'xpeedlxse', 'LX-x Se' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx3', 'LX-3' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbmini', 'Premium Mini' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbtwin', 'Premium Twin' , '', d)}\ @@ -26,6 +27,7 @@ ${@base_contains('MACHINEBUILD', 'sezam1000hd', 'Sezam' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezam5000hd', 'Sezam' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezammarvel', 'Sezam' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx', 'GI' , '', d)}\ +${@base_contains('MACHINEBUILD', 'xpeedlxse', 'GI' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx3', 'GI' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbmini', 'Miraclebox' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbtwin', 'Miraclebox' , '', d)}\ @@ -43,6 +45,7 @@ ${@base_contains('MACHINEBUILD', 'sezam1000hd', 'hde' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezam5000hd', 'hdx' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezammarvel', 'hdp' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx', 'xpeedlx' , '', d)}\ +${@base_contains('MACHINEBUILD', 'xpeedlxse', 'xpeedlxse' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx3', 'xpeedlx3' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbmini', 'miraclebox/mini' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbtwin', 'miraclebox/twin' , '', d)}\ @@ -60,6 +63,7 @@ ${@base_contains('MACHINEBUILD', 'sezam1000hd', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezam5000hd', 'mtd1' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezammarvel', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx', 'mtd2' , '', d)}\ +${@base_contains('MACHINEBUILD', 'xpeedlxse', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx3', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbmini', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbtwin', 'mtd1' , '', d)}\ @@ -77,6 +81,7 @@ ${@base_contains('MACHINEBUILD', 'sezam1000hd', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezam5000hd', 'mtd2' , '', d)}\ ${@base_contains('MACHINEBUILD', 'sezammarvel', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx', 'mtd0' , '', d)}\ +${@base_contains('MACHINEBUILD', 'xpeedlxse', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'xpeedlx3', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbmini', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'mbtwin', 'mtd2' , '', d)}\ @@ -85,7 +90,7 @@ ${@base_contains('MACHINEBUILD', 'atemio5x00', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'atemio6x00', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'atemionemesis', 'mtd0' , '', d)}\ ${@base_contains('MACHINEBUILD', 'beyonwizt3', 'mtd2' , '', d)}\ -${@base_contains('MACHINEBUILD', 'beyonwizt4', 'mtd2' , '', d)}\ +${@base_contains('MACHINEBUILD', 'beyonwizt4', 'mtd0' , '', d)}\ " KERNEL_FILE = "kernel.bin" @@ -117,7 +122,6 @@ PREFERRED_VERSION_nfs-utils ?= "1.2.8" PREFERRED_PROVIDER_virtual/blindscan-dvbs = "ini-blindscan-utils" PREFERRED_PROVIDER_virtual/blindscan-dvbc = "ini-blindscan-utils" -PREFERRED_PROVIDER_virtual/transtreamproxy = "ini-transtreamproxy" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}" diff --git a/meta-brands/meta-ini/conf/machine/inihdp.conf b/meta-brands/meta-ini/conf/machine/inihdp.conf index 42c6e035fa4..7c1ee1a0e01 100644 --- a/meta-brands/meta-ini/conf/machine/inihdp.conf +++ b/meta-brands/meta-ini/conf/machine/inihdp.conf @@ -1,17 +1,10 @@ include conf/machine/include/ini-oem.inc -EXTRA_IMAGEDEPENDS = "\ - ini-transtreamproxy \ - " - -KERNEL_MODULE_AUTOLOAD += "hid-logitech" -KERNEL_MODULE_AUTOLOAD += "hid-logitech-dj" - PREFERRED_PROVIDER_virtual/kernel = "linux-ini-hdp" PREFERRED_VERSION_linux-ini-hdp = "3.14.2" PREFERRED_VERSION_linux-libc-headers = "3.13" -MACHINE_FEATURES += "bwlcd255 fanctrl fan kernelrt2800 transcoding iniwol" +MACHINE_FEATURES += "bwlcd255 fanctrl fan kernelrt2800 iniwol" CHIPSET = "bcm7425" @@ -26,6 +19,7 @@ EXTRA_IMAGEDEPENDS = "\ " MACHINE_EXTRA_RDEPENDS = "\ + enigma2-plugin-systemplugins-multitranscodingsetup \ enigma2-plugin-systemplugins-micomupgrade \ \ ini-coldboot \ diff --git a/meta-brands/meta-ini/recipes-drivers/ini-dvb-modules-inihdp.bb b/meta-brands/meta-ini/recipes-drivers/ini-dvb-modules-inihdp.bb index 5b471aabdbf..ea8f22eac15 100644 --- a/meta-brands/meta-ini/recipes-drivers/ini-dvb-modules-inihdp.bb +++ b/meta-brands/meta-ini/recipes-drivers/ini-dvb-modules-inihdp.bb @@ -1,8 +1,8 @@ KV = "3.14.2" -SRCDATE = "20140716" +SRCDATE = "20140829" -SRC_URI[md5sum] = "8d3e75e29c86106699b517648f7f26ec" -SRC_URI[sha256sum] = "a9344701e2d1e0bed8888e5ee4621d97076c863850530cb884de6cf9133c1771" +SRC_URI[md5sum] = "f26768a22fc8ee7c60a54c94a79dd6dd" +SRC_URI[sha256sum] = "adb5ebcd5c4cfe2e37f4a9573347d6ff094ac4df391357f5e1aee41ed64602f8" SRC_URI = "http://code-ini.com/software/drivers/ini-hdp-drivers-${KV}-${SRCDATE}.zip" diff --git a/meta-brands/meta-ini/recipes-transcode/ini-transtreamproxy.bb b/meta-brands/meta-ini/recipes-transcode/ini-transtreamproxy.bb deleted file mode 100644 index 448a78186f5..00000000000 --- a/meta-brands/meta-ini/recipes-transcode/ini-transtreamproxy.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "streamproxy manages streaming data to a Mobile device using enigma2" -PRIORITY = "required" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit gitpkgv -SRCREV = "${AUTOREV}" -PV = "1.0+git${SRCPV}" -PKGV = "1.0+git${GITPKGV}" -PR = "r6" - -DEPENDS = "boost" - -PROVIDES += "virtual/transtreamproxy" -RPROVIDES_${PN} += "virtual/transtreamproxy" - -SRC_URI = "git://code-ini.com/ini-transtreamproxy;protocol=git" - -inherit autotools - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}/usr/bin - install -m 0755 ${WORKDIR}/build/src/transtreamproxy ${D}/usr/bin/transtreamproxy -} diff --git a/meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb b/meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb index 5b3b5cc5a6d..1a2e4ab04a2 100644 --- a/meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb +++ b/meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb @@ -15,6 +15,7 @@ PACKAGES += " \ PROVIDES += " \ enigma2-plugin-extensions-autotimer \ enigma2-plugin-systemplugins-autobouquetsmaker \ + enigma2-plugin-extensions-btdevicesmanager \ enigma2-plugin-systemplugins-blindscan \ enigma2-plugin-extensions-dlnabrowser \ enigma2-plugin-extensions-dlnaserver \ @@ -33,6 +34,7 @@ PROVIDES += " \ ${@base_contains("MACHINE_FEATURES", "audioeffect", "enigma2-plugin-systemplugins-audioeffect" , "", d)} \ enigma2-plugin-systemplugins-transcodingsetup \ enigma2-plugin-systemplugins-micomupgrade \ + enigma2-plugin-systemplugins-multitranscodingsetup \ enigma2-plugin-extensions-ondemand \ enigma2-plugin-extensions-fempa \ enigma2-plugin-extensions-lcd4linux \ @@ -62,6 +64,8 @@ DESCRIPTION_enigma2-plugin-systemplugins-audioeffect = "Audio Effect setup" DESCRIPTION_enigma2-plugin-systemplugins-autobouquetsmaker = "Automatically build and update bouquets from the satellite stream." RREPLACES_enigma2-plugin-systemplugins-autobouquetsmaker = "enigma2-plugin-extensions-autobouquets" RCONFLICTS_enigma2-plugin-systemplugins-autobouquetsmaker = "enigma2-plugin-extensions-autobouquets" +DESCRIPTION_enigma2-plugin-extensions-btdevicesmanager = "this is bt devices manger to pair e.x keyboard or mouse" +RDEPENDS_enigma2-plugin-extensions-btdevicesmanager = "bluez4-testtools bluez4 bluez-hcidump" DESCRIPTION_enigma2-plugin-systemplugins-blindscan = "blindscan..." RDEPENDS_enigma2-plugin-systemplugins-blindscan = "virtual/blindscan-dvbs" DESCRIPTION_enigma2-plugin-extensions-dlnabrowser = "this is dlna/upnp browser using djmount" @@ -91,6 +95,7 @@ RDEPENDS_enigma2-plugin-extensions-hbbtv = "vuplus-opera-browser-util" DEPENDS_enigma2-plugin-extensions-hbbtv = "vuplus-opera-browser-util" DESCRIPTION_enigma2-plugin-systemplugins-transcodingsetup = "Setup transcoding of your VU+" RDEPENDS_enigma2-plugin-systemplugins-transcodingsetup = "virtual/transtreamproxy" +DESCRIPTION_enigma2-plugin-systemplugins-multitranscodingsetup = "Setup transcoding of your INI HDp" DESCRIPTION_enigma2-plugin-systemplugins-micomupgrade = "micomupgrade" RDEPENDS_enigma2-plugin-extensions-ondemand = "python-dnspython python-beautifulsoup python-lxml python-simplejson python-pyamf" DESCRIPTION_enigma2-plugin-extensions-ondemand = "Watch on demand TV." @@ -113,7 +118,7 @@ inherit autotools-brokensep gitpkgv pythonnative SRCREV = "${AUTOREV}" PV = "2.0+git${SRCPV}" PKGV = "2.0+git${GITPKGV}" -PR = "r13" +PR = "r14" SRC_URI="git://github.com/oe-alliance/oe-alliance-plugins.git;protocol=git;branch=2.3"