From: hschang Date: Thu, 12 Mar 2015 04:33:39 +0000 (+0900) Subject: Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=d5ed73c8eb69b1df41a91be4c5a92fd8881eade9;hp=7d88dacb383779dc332994dae0fee0beb002dcac Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next 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..941c99b 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7335\nbrcmfb" -SRC_URI[md5sum] = "8ad22ff3193419ae087c4668e95476a1" -SRC_URI[sha256sum] = "b5723769d7db783767887524da8ba9b2590c57b900d777f974546d4ba8d6b0b8" +SRC_URI[md5sum] = "75bde1fe6b1f7d32af7c37f4e0d7e370" +SRC_URI[sha256sum] = "1d6d1a1796983b3be07f13bb82cffc030bdb4bb02eab4ae2afbe0175da0a925f" 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 --- 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 index 0000000..dcc6852 --- /dev/null +++ b/meta-bsp/common/recipes/vuplus/vuplus-tuner-turbo.inc @@ -0,0 +1,42 @@ +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 \ +" + +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 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 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 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..41f4959 100644 --- a/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend +++ b/meta-bsp/vuduo2/recipes/vuplus/libgles.bbappend @@ -1,6 +1,6 @@ -SRCDATE = "20150113" +SRCDATE = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "b4337f5feb34bda7be49a0526d52594c" -SRC_URI[sha256sum] = "7eddf21032483efdedd86cacdd60889f61e607c103a6032b1b1ca6d8fb65181a" +SRC_URI[md5sum] = "71ebcdea71e178ea9e754e0912a0a941" +SRC_URI[sha256sum] = "ed7d446b51e8cbb088d76b9dfc185a7b9dc67d63d79be204a6c4b09df0090c8c" diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend index b119e46..cca3be7 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7424\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "3be0e95ba3731f721474f03984853b96" -SRC_URI[sha256sum] = "68f38db95d9fcd8925a03f511ee536623db882cb6149e645c12719282e460f8b" +SRC_URI[md5sum] = "d5dcefed0369ab77eed13f7bb58b12f1" +SRC_URI[sha256sum] = "d60b5c3b968fcd48d2533f018f9327a2c6e16b21356351bb8db550150c834e2e" diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend index dfc5fd2..ff2530c 100644 --- 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 = "20150302" 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] = "9633342a561268a08509e636e832fd9f" +SRC_URI[sha256sum] = "4ae626ecd7be77f913a246e550325868330725cfd5666af4755d9ea887cf9165" diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-platform-util.bbappend index 72ad3ac..001d17d 100644 --- 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 = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "6a29e90f88d15e6ca1fcd5dc590d30a7" -SRC_URI[sha256sum] = "814f8f18b91e09991b5d00fb4973e2c87397fc9ba83fff916dd8a57d1be96a3a" +SRC_URI[md5sum] = "ed95e7693e59b8dc0065b1c1d1b24e35" +SRC_URI[sha256sum] = "b5a0147cd353b75f160cba2879539b2b6a55630a266140d99b72928097c92cf8" diff --git a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend index f0bf9fb..5ec5cc1 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7325\nbrcmfb" -SRC_URI[md5sum] = "30d3b5b7bdd5d08474e87e80534b3502" -SRC_URI[sha256sum] = "8c270be151cfcff0ece56604c0fe7e513a74bdbfcaeb8c6d2c5bf1a84722cc3d" +SRC_URI[md5sum] = "4a076866b74b3f853605bd07c3ed600e" +SRC_URI[sha256sum] = "85e4b9e7a3923def3dd88c2727bacb4ce5f0e915c42be2a5248237c7c7e30fe5" diff --git a/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend b/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend index d93564b..8b06d89 100644 --- a/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend +++ b/meta-bsp/vusolo2/recipes/vuplus/libgles.bbappend @@ -1,6 +1,6 @@ -SRCDATE = "20150113" +SRCDATE = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "86f073e739326fc49d0bddcda9ff6cd0" -SRC_URI[sha256sum] = "6e105eb10fcfbd38248f4ce91a0c105274a10a1aed8cc5c71a797fabeb377744" +SRC_URI[md5sum] = "004764c6607076abf0e2e1d2e7e7d6e1" +SRC_URI[sha256sum] = "420972d66ed2fd0fbc192b2434348bb3e624f1556adbc0e539409c6604a236c1" diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend index 3d7c78e..498d448 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7356\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "d2a9dc1737bcbe9be1496d82c698fa02" -SRC_URI[sha256sum] = "820774b0a26ba39c5cdd3bf0b7811c62ec1d4bc144045eda01d66c4b24679563" +SRC_URI[md5sum] = "548e1d8f63f965972fbc331556422ce4" +SRC_URI[sha256sum] = "324ed0daf6f330fede8b922150a2cfe6788b26749fa49cfdb946ee0db9f919e6" diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend index dac3ac2..bf3094a 100644 --- 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 = "20150302" 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] = "9d3c926e9452e0ed922b7cd4f3d8bdb9" +SRC_URI[sha256sum] = "ab684371e5fdf365d19ac602e903c5f355d09fcd595814b13cb54118a4bf129e" diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-platform-util.bbappend index 22ad161..0c0e9e6 100644 --- 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 = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "3bfe9df77f7ea5d755dac385e9442b84" -SRC_URI[sha256sum] = "21ddc413a229ff9c86452b2a2fbe0c02a68a87399f2bd2e84d7674977ac9c424" +SRC_URI[md5sum] = "c7a1f0719d0fdcce4c0613469e9013a0" +SRC_URI[sha256sum] = "f72452a06a90e3f4a0473667c15dc4736237d9edf439dfca413185b387353356" + diff --git a/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend b/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend index 4bea6a3..38fa8a3 100644 --- a/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend +++ b/meta-bsp/vusolose/recipes/vuplus/libgles.bbappend @@ -1,5 +1,5 @@ -SRCDATE = "20150113" +SRCDATE = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "f05e16dd82ffdff17c90cdaab21f3f84" -SRC_URI[sha256sum] = "273fabf8ffb512d79d1b0dcc4674bff26c01e84fbf09d8de24810cfcf5b9fb52" +SRC_URI[md5sum] = "c6c8882d4fe1958e5f1fab3ba254a583" +SRC_URI[sha256sum] = "3900237115e5de8c2365b6151f82bb340598d4ce6c473bda3b8e79a3ebf74e64" diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend index b4c0018..d38543a 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7241\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "e4a33e61cb202ee3b75b6a8e5c093422" -SRC_URI[sha256sum] = "5ede86f97591c2515ae9421702d43bc9afdf0753c3b95b9153186690ad0854a5" +SRC_URI[md5sum] = "701a4668549a3ef4c4642fab5174de90" +SRC_URI[sha256sum] = "cb42f36257339f49d273ef315c3e80a0c149e681d043d275c977d54fc951d606" diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend index d8045c4..9392dcd 100644 --- 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 = "20150302" 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] = "73e636c13d545a7421055adecdff0efa" +SRC_URI[sha256sum] = "0548027af76eeda4c2b8ae4e178115b89d3188a8d19362d3f132358aa01f8cc8" diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-platform-util.bbappend index 9d8d8a7..c67e47e 100644 --- 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 = "20150302" SRCDATE_PR = "r0" -SRC_URI[md5sum] = "cb0c919e65ef0fd636ccc0bf50fe5b0f" -SRC_URI[sha256sum] = "92cc27f4426c49061c275f2022d85aece32565a8bc9458578f6aaf04665401f2" +SRC_URI[md5sum] = "2f4a1f0ca22ee981b00828d7c1240320" +SRC_URI[sha256sum] = "013a5afa876149ae0bf769aca8ab937258a66dd7ab018cea15193cec813405f8" diff --git a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend index aafedd4..3e74fd2 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "e65448b599aa2ef0bf3339330947727e" -SRC_URI[sha256sum] = "e28ea654e85c67820398cd4836e1cd401c987df72feaa63162fe2bcdb85f9b5a" +SRC_URI[md5sum] = "c17d58e032e70198c9031079973625e7" +SRC_URI[sha256sum] = "8404e152681579bff107e7f3c716ae380535d93ac37a77646d570d9de191ea37" diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend index 144a9b8..9b28fce 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "bf461f578fd460da34145e3ea196646d" -SRC_URI[sha256sum] = "303d248ee5cdebd62d153de21b67db965d7e05c654268f5e1fe17bdc8b85bcd0" +SRC_URI[md5sum] = "34fdabb3c9871b3da92d4080a66b9870" +SRC_URI[sha256sum] = "9955f4adc949333f603aeb2733933767761816236c9bc5bfcc52060ef6e36a55" diff --git a/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend index 15f848d..3bcd507 100644 --- 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 = "20150302" MODULES_NAME = "procmk\ndvb-bcm7362\nbrcmfb\nfpga_directc" -SRC_URI[md5sum] = "276cdfe847c8969b6f253c785d54e175" -SRC_URI[sha256sum] = "052f2441f04aef3abb27f3014026cbeb630c115cf70cf27988f2e5235fcbd42c" +SRC_URI[md5sum] = "2c2be8b8a11db708d1c607d817e88b4d" +SRC_URI[sha256sum] = "cdbbc974c4454ffb49449bd48454ef85cef82929feb74db797de2b98dacb8c49" diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 71525f1..7464f06 100644 --- 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 --- 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 --- 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 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++)