[transtreamproxy] add support for multiple providers.

oe-alliance · Jan 28, 2014 · 73d5cc1 · 73d5cc1
1 parent 4058dee
commit 73d5cc1
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 5 deletions.
diff --git a/conf/machine/include/ini-oem.inc b/conf/machine/include/ini-oem.inc
@@ -60,6 +60,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ini"
 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}"
 KERNEL_CONSOLE = "ttyS0,115200n8"

diff --git a/conf/machine/include/vuplus.inc b/conf/machine/include/vuplus.inc
@@ -31,6 +31,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus"
 PREFERRED_PROVIDER_virtual/blindscan-dvbc = "vuplus-blindscan-utils"
 PREFERRED_PROVIDER_virtual/blindscan-dvbs = "vuplus-blindscan-utils"
 
+PREFERRED_PROVIDER_virtual/transtreamproxy = "vuplus-transtreamproxy"
+
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}"
 KERNEL_CONSOLE = "ttyS0,115200n8"

diff --git a/conf/machine/vuduo2.conf b/conf/machine/vuduo2.conf
@@ -26,7 +26,6 @@ EXTRA_IMAGEDEPENDS = "\
     lcd4linuxsupport \
     vuplus-displayvfd \
     vuplus-checkvfd \
-    vuplus-transtreamproxy \
     vuplus-initrd-cfe-vuduo2"
 
 MACHINE_EXTRA_RDEPENDS = "\

diff --git a/conf/machine/vusolo2.conf b/conf/machine/vusolo2.conf
@@ -24,7 +24,6 @@ IMAGE_CMD_ubi_append = " \
 
 EXTRA_IMAGEDEPENDS = "\
     vuplus-displayvfd \
-    vuplus-transtreamproxy \
     vuplus-initrd-cfe-vusolo2"
 
 MACHINE_EXTRA_RDEPENDS = "\

diff --git a/recipes-bsp/ini/ini-transtreamproxy.bb b/recipes-bsp/ini/ini-transtreamproxy.bb
@@ -0,0 +1,24 @@
+SUMMARY = "streamproxy manages streaming data to a Mobile device using enigma2"
+PRIORITY = "required"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit gitpkgv
+SRCREV = "${AUTOREV}"
+PV = "1.0+git${SRCPV}"
+PKGV = "1.0+git${GITPKGV}"
+PR = "r2"
+
+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 ${S}/src/transtreamproxy ${D}/usr/bin/transtreamproxy
+}
diff --git a/recipes-bsp/vuplus/vuplus-transtreamproxy.bb b/recipes-bsp/vuplus/vuplus-transtreamproxy.bb
@@ -7,7 +7,10 @@ inherit gitpkgv
 SRCREV = "${AUTOREV}"
 PV = "1.0+git${SRCPV}"
 PKGV = "1.0+git${GITPKGV}"
-PR = "r6"
+PR = "r7"
+
+PROVIDES += "virtual/transtreamproxy"
+RPROVIDES_{PN} += "virtual/transtreamproxy"
 
 SRC_URI = "git://code.vuplus.com/git/filestreamproxy.git;protocol=git;branch=transtreamproxy"
 

diff --git a/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb b/recipes-oe-alliance/enigma2-plugins/enigma2-oe-alliance-plugins.bb
@@ -42,6 +42,7 @@ PROVIDES += " \
 DEPENDS = "\
     ${@base_contains("MACHINE_FEATURES", "blindscan-dvbc", "virtual/blindscan-dvbc" , "", d)} \
     ${@base_contains("MACHINE_FEATURES", "blindscan-dvbs", "virtual/blindscan-dvbs" , "", d)} \
+    ${@base_contains("MACHINE_FEATURES", "transcoding", "virtual/transtreamproxy" , "", d)} \
     python-dnspython python-beautifulsoup python-lxml python-simplejson python-pyamf python-icalendar python-pyusb \
     djmount \
     librtmp \
@@ -88,7 +89,7 @@ DESCRIPTION_enigma2-plugin-extensions-hbbtv = "HbbTV player"
 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 = "vuplus-transtreamproxy"
+RDEPENDS_enigma2-plugin-systemplugins-transcodingsetup = "virtual/transtreamproxy"
 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."
@@ -108,7 +109,7 @@ inherit gitpkgv autotools pythonnative
 SRCREV = "${AUTOREV}"
 PV = "2.0+git${SRCPV}"
 PKGV = "2.0+git${GITPKGV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI="git://github.com/oe-alliance/oe-alliance-plugins.git;protocol=git"