Merge remote-tracking branch 'oe_21/master' into vuplus-3.0

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

diff --git a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
index 3389ac1..f6c42f8 100644 (file)
--- a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7335\nbrcmfb"
 
-SRC_URI[md5sum] = "8ad22ff3193419ae087c4668e95476a1"
-SRC_URI[sha256sum] = "b5723769d7db783767887524da8ba9b2590c57b900d777f974546d4ba8d6b0b8"
+SRC_URI[md5sum] = "400ec6413597f8096bba506496422f6d"
+SRC_URI[sha256sum] = "f5762df3a4c1281be8ac3aa87c8937b85573b60902b376b3c79a7f468face5aa"

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
index c1258ae..41d0fff 100755 (executable)
--- a/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
+++ b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
@@ -5,7 +5,7 @@ RDEPENDS_${PN} = "ncurses"
 
 LICENSE = "CLOSED"
 
-PV = "3.7"
+PV = "3.8"
 PR = "r1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -70,6 +70,6 @@ do_install_vusolose() {
        done
 }
 
-SRC_URI[md5sum] = "94873fcb634bf4f9519c39bceb4b5a6f"
-SRC_URI[sha256sum] = "70c4dc7afba1f70bc7be51ad7a0785b99d12cf874b43a653deddcf86ef736c71"
+SRC_URI[md5sum] = "0efbbfd6816d00bd808d2897995a87a6"
+SRC_URI[sha256sum] = "486a22c76e051e98dcc54129ca62ad05d41c2fb78a5cdf9324ca161fece00cd7"
 

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
new file mode 100644 (file)
index 0000000..710c9ca
--- /dev/null
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc
@@ -0,0 +1,45 @@
+DESCRIPTION = "Hardware drivers and blindscan util for Vuplus Tuner Turbo"
+SECTION = "base"
+LICENSE = "CLOSED"
+
+SRCDATE = "20150303"
+FW_SRCDATE = "20150303"
+KV = "${VUPLUS_KERNEL_VERSION}"
+PV = "${KV}"
+PR = "${SRCDATE}"
+
+SRC_URI = " \
+       http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_driver_${PV}_${SRCDATE}.tar.gz;name=driver \
+       http://archive.vuplus.com/download/usb/tuner/turbo/vuplus_tuner_turbo_bin_fw_${FW_SRCDATE}.tar.gz;name=binfw \
+"
+
+DEPENDS += "virtual/kernel module-init-tools"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+S = "${WORKDIR}"
+
+inherit module-base
+
+do_install() {
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus
+       install -m 0644 ${S}/vuplus_tuner_turbo_driver.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/media/usb/vuplus/vuplus_tuner_turbo_driver.ko
+       install -d ${D}/lib/firmware/
+       install -m 0644 ${S}/Vuplus_Turbo_USB_0101.fw ${D}/lib/firmware/Vuplus_Turbo_USB_0101.fw
+       install -d "${D}/${bindir}"
+       install -m 0755 "${S}/vuplus_turbo_c" "${D}/${bindir}"
+       install -m 0755 "${S}/vuplus_turbo_t" "${D}/${bindir}"
+}
+
+pkg_postinst_${PN} () {
+        if [ -d /proc/stb ]; then
+                depmod -a
+        fi
+        true
+}
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+FILES_${PN} = "/"
+
+SRC_URI[binfw.md5sum] = "517a9d54e41fae16612bcfe431ef7a3e"
+SRC_URI[binfw.sha256sum] = "b39f0b38684c44a13dd62ac4286a4a73bcf74fd25a881ecfe97d292535163ca0"
+

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.13.5.bb b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.13.5.bb
new file mode 100644 (file)
index 0000000..39197e7
--- /dev/null
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.13.5.bb
@@ -0,0 +1,8 @@
+require vuplus-tuner-turbo.inc
+
+COMPATIBLE_MACHINE = "^(vusolo2|vuduo2|vusolose|vuzero)$"
+
+SRCDATE = "20150303"
+
+SRC_URI[driver.md5sum] = "93a2fcb1445c16091eb2517cf4d06a00"
+SRC_URI[driver.sha256sum] = "c35bacdaafd522f9fc07f51c0f016a48371457d9175c33ce1b3cd4c607c51174"

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r1.bb b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r1.bb
new file mode 100644 (file)
index 0000000..ef1ee95
--- /dev/null
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r1.bb
@@ -0,0 +1,10 @@
+require vuplus-tuner-turbo.inc
+
+COMPATIBLE_MACHINE = "^(bm750|vuuno|vuultimo)$"
+
+KV = "${VUPLUS_KERNEL_VERSION}_R1"
+
+SRCDATE = "20150303"
+
+SRC_URI[driver.md5sum] = "3e85268a9cdc8379564e4e8a7a6ff035"
+SRC_URI[driver.sha256sum] = "1314df03abd7e9eb9a11be7ddbb9c67e1ac4be3dd658efd75b137bc08754315c"

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r2.bb b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r2.bb
new file mode 100644 (file)
index 0000000..23f8b52
--- /dev/null
+++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo_3.9.6-r2.bb
@@ -0,0 +1,10 @@
+require vuplus-tuner-turbo.inc
+
+COMPATIBLE_MACHINE = "^(vusolo)$"
+
+KV = "${VUPLUS_KERNEL_VERSION}_R2"
+
+SRCDATE = "20150303"
+
+SRC_URI[driver.md5sum] = "445b120a3a290719fbfc7e97c0a41e0d"
+SRC_URI[driver.sha256sum] = "3f872235f5aa379c8122349e4fa3058bcd61790fbdf8a45f419c27e69de3f150"

diff --git a/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend b/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend
index 3503905..f8564f3 100644 (file)
--- a/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 
-SRC_URI[md5sum] = "b4337f5feb34bda7be49a0526d52594c"
-SRC_URI[sha256sum] = "7eddf21032483efdedd86cacdd60889f61e607c103a6032b1b1ca6d8fb65181a"
+SRC_URI[md5sum] = "e204bc223b4129f5f8d4e9a60eb60743"
+SRC_URI[sha256sum] = "1f927efed7cc860342c0dc621a85792e2ec3a361d8e32b5389e443e312c285d2"

diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
index b119e46..a2e8fc0 100644 (file)
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7424\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "3be0e95ba3731f721474f03984853b96"
-SRC_URI[sha256sum] = "68f38db95d9fcd8925a03f511ee536623db882cb6149e645c12719282e460f8b"
+SRC_URI[md5sum] = "c817f8d5b67a77318049f2d5bc3e7433"
+SRC_URI[sha256sum] = "d3b2438de2e25aec08051851f2a81314a6e11f417a66dcfde49a11f3f2c449da"

diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dfc5fd2..07953c1 100644 (file)
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@ -1,4 +1,4 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 pkg_postinst_${PN}_append () {
@@ -6,5 +6,5 @@ pkg_postinst_${PN}_append () {
 }
 
 
-SRC_URI[md5sum] = "53e47f210025250f95b314c8deb83302"
-SRC_URI[sha256sum] = "9775def1dfb10ed5856ba53787c337878608e16180cf1470a2e1d897b59f5d53"
+SRC_URI[md5sum] = "630c5b0a6737e650e6ec6e049081ece2"
+SRC_URI[sha256sum] = "aa3ac0d8bb1b4c9cf94a2da5bc98fcc592af277c846a62493661d051166a2462"

diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend
index 72ad3ac..3c9bcba 100644 (file)
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 
-SRC_URI[md5sum] = "6a29e90f88d15e6ca1fcd5dc590d30a7"
-SRC_URI[sha256sum] = "814f8f18b91e09991b5d00fb4973e2c87397fc9ba83fff916dd8a57d1be96a3a"
+SRC_URI[md5sum] = "6c88933a8a994691daa2c78f762d139e"
+SRC_URI[sha256sum] = "cf3f4be223393a846e81dd0792f21940bb4a6eed9a9ad09be3c752d34a765ace"

diff --git a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
index f0bf9fb..006d859 100644 (file)
--- a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7325\nbrcmfb"
 
-SRC_URI[md5sum] = "30d3b5b7bdd5d08474e87e80534b3502"
-SRC_URI[sha256sum] = "8c270be151cfcff0ece56604c0fe7e513a74bdbfcaeb8c6d2c5bf1a84722cc3d"
+SRC_URI[md5sum] = "04b93c52a03e2dfd9284f466023d08e6"
+SRC_URI[sha256sum] = "214c28d4bf97dad720c852e2207114d381b2ef78df8220da05b810cf057ec31b"

diff --git a/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend b/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend
index d93564b..abce812 100644 (file)
--- a/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 
-SRC_URI[md5sum] = "86f073e739326fc49d0bddcda9ff6cd0"
-SRC_URI[sha256sum] = "6e105eb10fcfbd38248f4ce91a0c105274a10a1aed8cc5c71a797fabeb377744"
+SRC_URI[md5sum] = "5e51f361cc15a811b29442ec179e11f6"
+SRC_URI[sha256sum] = "6338d0a32fa520622fdbaef776be26d4cbb4515ae40e7891b43ff1521d6c7428"

diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend
index 3d7c78e..8711475 100644 (file)
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7356\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "d2a9dc1737bcbe9be1496d82c698fa02"
-SRC_URI[sha256sum] = "820774b0a26ba39c5cdd3bf0b7811c62ec1d4bc144045eda01d66c4b24679563"
+SRC_URI[md5sum] = "95dc0515f10513cd1f64c7198da0fec8"
+SRC_URI[sha256sum] = "d5c0effdacd09c739f44af3a64a14990971070e9959c60270e760f20869eef7b"

diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
index dac3ac2..9ee05b9 100644 (file)
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@ -1,4 +1,4 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 pkg_postinst_${PN}_append () {
@@ -6,5 +6,5 @@ pkg_postinst_${PN}_append () {
 }
 
 
-SRC_URI[md5sum] = "5ebb1c74553b836b22a41ef485b46e27"
-SRC_URI[sha256sum] = "598747ddf461ef6cd43bffd246427251d2338da040240e15602b8e72c0735369"
+SRC_URI[md5sum] = "a91d808dfdc799011778cd997444938b"
+SRC_URI[sha256sum] = "a588df43683f2a6bf7c1e02fc4d352734c19a6badfce3e8df61945c62e7eb8cd"

diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend
index 22ad161..abbf8a8 100644 (file)
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend
@@ -1,6 +1,7 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 
-SRC_URI[md5sum] = "3bfe9df77f7ea5d755dac385e9442b84"
-SRC_URI[sha256sum] = "21ddc413a229ff9c86452b2a2fbe0c02a68a87399f2bd2e84d7674977ac9c424"
+
+SRC_URI[md5sum] = "915de77ea343ec6850bdcd4755547b60"
+SRC_URI[sha256sum] = "f43981d7dda27dce55c9d58ee833e82b0a99fde162f494dc9738fe4dc480d160"

diff --git a/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend b/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend
index 4bea6a3..2473704 100644 (file)
--- a/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend
@@ -1,5 +1,5 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
-SRC_URI[md5sum] = "f05e16dd82ffdff17c90cdaab21f3f84"
-SRC_URI[sha256sum] = "273fabf8ffb512d79d1b0dcc4674bff26c01e84fbf09d8de24810cfcf5b9fb52"
+SRC_URI[md5sum] = "40a8a0b1bb34374a912363a14ad82ffe"
+SRC_URI[sha256sum] = "aa000eb59a0ae9a063ada9b61d4e042794c74f310001e863f315199b8307aaaf"

diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
index b4c0018..703b3b7 100644 (file)
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7241\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "e4a33e61cb202ee3b75b6a8e5c093422"
-SRC_URI[sha256sum] = "5ede86f97591c2515ae9421702d43bc9afdf0753c3b95b9153186690ad0854a5"
+SRC_URI[md5sum] = "c714087e0528a142957f2c4630183914"
+SRC_URI[sha256sum] = "7f7ec96cb8c2f3db3c07a56de3a8cd7aa0196692e56a9bf5bc315ce81fa7b33a"

diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
index d8045c4..6f0bffc 100644 (file)
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
@@ -1,9 +1,9 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
 pkg_postinst_${PN}_append () {
   ln -s /lib/modules/${KERNEL_VERSION}/extra/dvb-bcm7241.ko $D/lib/modules/${KERNEL_VERSION}/extra/dvb-bcm.ko
 }
 
-SRC_URI[md5sum] = "af6a79ba8c1df1b6c502c5891ace8186"
-SRC_URI[sha256sum] = "fb8e7ad8d2116f8f01b36e11c60d42fcd966d76211499b8810b1784caa8f901e"
+SRC_URI[md5sum] = "bbd29f3c5a7915cae04ffeb6cf89a6cc"
+SRC_URI[sha256sum] = "7231bf1fa368c684127f0a031bb11d5339dc366cd8563857a5fd029b85020018"

diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend
index 9d8d8a7..3a46acd 100644 (file)
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend
@@ -1,5 +1,5 @@
-SRCDATE = "20150113"
+SRCDATE = "20150317"
 SRCDATE_PR = "r0"
 
-SRC_URI[md5sum] = "cb0c919e65ef0fd636ccc0bf50fe5b0f"
-SRC_URI[sha256sum] = "92cc27f4426c49061c275f2022d85aece32565a8bc9458578f6aaf04665401f2"
+SRC_URI[md5sum] = "e3060b3859a45d96892eed65c82dafc4"
+SRC_URI[sha256sum] = "e41c884858ad19a8a07b4cb4797dbc934041ea0430310117c4be310de170d65c"

diff --git a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
index aafedd4..49fda27 100644 (file)
--- a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "e65448b599aa2ef0bf3339330947727e"
-SRC_URI[sha256sum] = "e28ea654e85c67820398cd4836e1cd401c987df72feaa63162fe2bcdb85f9b5a"
+SRC_URI[md5sum] = "49c3561be4f9d219e4e60d8e97748871"
+SRC_URI[sha256sum] = "cec05afe8d37f45084daa685eda2d1f187bbf812926831548c5d15cdd76c5716"

diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
index 144a9b8..9ed1ae3 100644 (file)
--- a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "bf461f578fd460da34145e3ea196646d"
-SRC_URI[sha256sum] = "303d248ee5cdebd62d153de21b67db965d7e05c654268f5e1fe17bdc8b85bcd0"
+SRC_URI[md5sum] = "2f4fb7d840c0dc6abd9ed45012334108"
+SRC_URI[sha256sum] = "50f07c46334bbcc8f7890086975b2bdae5915ddf55fb8ed757d28f73c6dace71"

diff --git a/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
index 15f848d..d47f923 100644 (file)
--- a/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20150109"
+SRCDATE = "20150317"
 
 MODULES_NAME = "procmk\ndvb-bcm7362\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "276cdfe847c8969b6f253c785d54e175"
-SRC_URI[sha256sum] = "052f2441f04aef3abb27f3014026cbeb630c115cf70cf27988f2e5235fcbd42c"
+SRC_URI[md5sum] = "0aa8809a5a23ee6ddba3c43e296c3196"
+SRC_URI[sha256sum] = "8892eaa4010013a09b2743c4d52643f51005638a55193b13605dbaab49807611"

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 71525f1..7464f06 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -198,7 +198,7 @@ DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugle
 RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 
 PN = "enigma2"
-PR = "r100"
+PR = "r101"
 
 inherit gitpkgv pythonnative
 

diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
index ca6c040..4daa4d7 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
@@ -8,13 +8,14 @@ RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
 RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}'
 
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
 ESSENTIAL_RDEPENDS = " \
+       vuplus-tuner-turbo \
 "
 
 KERNEL_FS_MODULES = " \

diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 10f4e56..397423e 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
@@ -4,12 +4,13 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 PV = "1.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
 SRC_REV = ""
 
 SRC_URI = " \
        git://code.vuplus.com/git/vtuner.git;protocol=git;tag=${SRC_REV} \
        file://no_usb_device.patch;striplevel=1 \
+       file://fix_set_delsys.patch \
        file://${PN}.sh \
        "
 

diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_set_delsys.patch b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_set_delsys.patch
new file mode 100644 (file)
index 0000000..b456e99
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_set_delsys.patch
@@ -0,0 +1,54 @@
+diff --git a/usbtunerhelper.c b/usbtunerhelper.c
+index 93ae110..77b8728 100644
+--- a/usbtunerhelper.c
++++ b/usbtunerhelper.c
+@@ -533,7 +533,6 @@ int init_adapter(int id)
+       ioctl(adapter->vtuner, VTUNER_SET_NAME, adapter->name);
+       ioctl(adapter->vtuner, VTUNER_SET_TYPE, type);
+       ioctl(adapter->vtuner, VTUNER_SET_FE_INFO, &fe_info);
+-      ioctl(adapter->vtuner, VTUNER_SET_HAS_OUTPUTS, "no");
+ #if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 5
+       {
+               struct dtv_properties props;
+@@ -541,12 +540,14 @@ int init_adapter(int id)
+               props.num = 1;
+               props.props = p;
+               p[0].cmd = DTV_ENUM_DELSYS;
++              memset(p[0].u.buffer.data, 0, sizeof(p[0].u.buffer.data));
+               if (ioctl(adapter->frontend, FE_GET_PROPERTY, &props) >= 0)
+               {
+                       ioctl(adapter->vtuner, VTUNER_SET_DELSYS, p[0].u.buffer.data);
+               }
+       }
+ #endif
++      ioctl(adapter->vtuner, VTUNER_SET_HAS_OUTPUTS, "no");
+ 
+       memset(adapter->pidlist, 0xff, sizeof(adapter->pidlist));
+       adapter->buffer = malloc(BUFFER_SIZE);
+@@ -599,6 +600,8 @@ int main(int argc, char *argv[])
+       int i;
+       int ok = 0;
+       int debug = 0;
++      int scan_inverval = 1;
++      int scan_count = 60;
+ 
+       char option;
+       while ((option = getopt(argc, argv, "dh")) >= 0)
+@@ -621,8 +624,15 @@ int main(int argc, char *argv[])
+ 
+       while (running)
+       {
+-              if (scan_adapters() > 0) break;
+-              sleep(5);
++              if (scan_adapters() > 0)
++                      break;
++
++              if (scan_count > 0)
++                      scan_count--;
++              else
++                      scan_inverval = 5;
++
++              sleep(scan_inverval);
+       }
+ 
+       for (i = 0; i < adaptercount; i++)