Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

  • Loading branch information...
commit 94d3842315d6b98edf0bacae8374bbee61b251f5 2 parents 82c55cd + bd6d680
@sraue sraue authored
View
2  packages/addons/service/multimedia/hts-tvheadend/addon
@@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
- cp -P $PKG_BUILD/build.Linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
+ cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin
View
1  packages/addons/service/multimedia/hts-tvheadend/build
@@ -34,3 +34,4 @@ cd $PKG_BUILD
--release
make
+make build.linux/tvheadend.bundle
View
3  packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+2.1.3
+- update to hts-tvheadend-78213a0
+
2.1.2
- add suspend/resume fixes
- use KILL signal to stop tvheadend
View
4 packages/addons/service/multimedia/hts-tvheadend/meta
@@ -19,8 +19,8 @@
################################################################################
PKG_NAME="hts-tvheadend"
-PKG_VERSION="85e23bb"
-PKG_REV="2"
+PKG_VERSION="78213a0"
+PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
View
0  ...90-add_CH-GA-Weissenstein_muxes-0.1.patch → ...90-add_CH-GA-Weissenstein_muxes-0.1.patch
File renamed without changes
View
0  ...-85e23bb-091-cwc-connection-attempt.patch → ...-78213a0-091-cwc-connection-attempt.patch
File renamed without changes
View
0  ...092-deliver_raw_teletext_to_clients.patch → ...092-deliver_raw_teletext_to_clients.patch
File renamed without changes
View
0  ...23bb-093-add_support_for_IPTV_radio.patch → ...13a0-093-add_support_for_IPTV_radio.patch
File renamed without changes
View
24 ...imedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-095-fix_ca_descr_parser_for_4aee.patch
@@ -1,24 +0,0 @@
-commit 73e7b152ac8a5c83d93c2ae9ae9e0e90a506d37d
-Author: Stefan Saraev <stefan@saraev.ca>
-Date: Thu Mar 22 13:13:22 2012 +0200
-
- fix ca descr parsing for caid 4AEE
- - bulsatcom on hellas 39e, bulcrypt, NOT drecrypt
-
-diff --git a/src/psi.c b/src/psi.c
-index 130678d..116e001 100644
---- a/src/psi.c
-+++ b/src/psi.c
-@@ -307,8 +307,10 @@ psi_desc_ca(service_t *t, const uint8_t *buffer, int size)
- }
- break;
- case 0x4a00://DRECrypt
-- provid = size < 4 ? 0 : buffer[4];
-- break;
-+ if (caid != 0x4aee) { // Bulcrypt
-+ provid = size < 4 ? 0 : buffer[4];
-+ break;
-+ }
- default:
- provid = 0;
- break;
View
93 ...ice/multimedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-096-bulcrypt_emm_support.patch
@@ -1,93 +0,0 @@
-diff --git a/src/cwc.c b/src/cwc.c
-index 895eaf6..dfb3a6f 100644
---- a/src/cwc.c
-+++ b/src/cwc.c
-@@ -61,6 +61,7 @@ typedef enum {
- CARD_VIACCESS,
- CARD_NAGRA,
- CARD_NDS,
-+ CARD_BULCRYPT,
- CARD_UNKNOWN
- } card_type_t;
-
-@@ -280,6 +281,7 @@ void cwc_emm_seca(cwc_t *cwc, uint8_t *data, int len);
- void cwc_emm_viaccess(cwc_t *cwc, uint8_t *data, int len);
- void cwc_emm_nagra(cwc_t *cwc, uint8_t *data, int len);
- void cwc_emm_nds(cwc_t *cwc, uint8_t *data, int len);
-+void cwc_emm_bulcrypt(cwc_t *cwc, uint8_t *data, int len);
-
-
- /**
-@@ -658,6 +660,15 @@ static void
- cwc_detect_card_type(cwc_t *cwc)
- {
- uint8_t c_sys = cwc->cwc_caid >> 8;
-+
-+ switch(cwc->cwc_caid) {
-+ case 0x5581:
-+ case 0x4aee:
-+ cwc->cwc_card_type = CARD_BULCRYPT;
-+ tvhlog(LOG_INFO, "cwc", "%s:%i: bulcrypt card",
-+ cwc->cwc_hostname, cwc->cwc_port);
-+ return;
-+ }
-
- switch(c_sys) {
- case 0x17:
-@@ -1212,6 +1223,9 @@ cwc_emm(uint8_t *data, int len)
- case CARD_NDS:
- cwc_emm_nds(cwc, data, len);
- break;
-+ case CARD_BULCRYPT:
-+ cwc_emm_bulcrypt(cwc, data, len);
-+ break;
- case CARD_UNKNOWN:
- break;
- }
-@@ -1656,6 +1670,31 @@ cwc_emm_nds(cwc_t *cwc, uint8_t *data, int len)
- cwc_send_msg(cwc, data, len, 0, 1);
- }
-
-+void
-+cwc_emm_bulcrypt(cwc_t *cwc, uint8_t *data, int len)
-+{
-+ int match = 0;
-+
-+ switch (data[0]) {
-+ case 0x82: /* unique */
-+ case 0x85: /* unique */
-+ match = len >= 10 && memcmp(data + 3, cwc->cwc_ua + 2, 3) == 0;
-+ break;
-+ case 0x84: /* shared */
-+ match = len >= 10 && memcmp(data + 3, cwc->cwc_ua + 2, 2) == 0;
-+ break;
-+ case 0x8b: /* shared-unknown */
-+ match = len >= 10 && memcmp(data + 4, cwc->cwc_ua + 2, 2) == 0;
-+ break;
-+ case 0x8a: /* global */
-+ match = len >= 10 && memcmp(data + 4, cwc->cwc_ua + 2, 1) == 0;
-+ break;
-+ }
-+
-+ if (match)
-+ cwc_send_msg(cwc, data, len, 0, 1);
-+}
-+
- /**
- *
- */
-diff --git a/src/psi.c b/src/psi.c
-index 116e001..57c34f4 100644
---- a/src/psi.c
-+++ b/src/psi.c
-@@ -868,7 +868,9 @@ static struct strtab caidnametab[] = {
- { "GI", 0x4700 },
- { "Telemann", 0x4800 },
- { "DRECrypt", 0x4ae0 },
-- { "DRECrypt2", 0x4ae1 }
-+ { "DRECrypt2", 0x4ae1 },
-+ { "Bulcrypt", 0x4aee },
-+ { "Bulcrypt", 0x5581 },
- };
-
- const char *
View
4 packages/addons/service/softcam/oscam/changelog.txt
@@ -1,3 +1,7 @@
+2.1.4
+- update to oscam-6626
+ * added bulcrypt cas support
+
2.1.3
- update to oscam-6596
View
4 packages/addons/service/softcam/oscam/meta
@@ -20,8 +20,8 @@
################################################################################
PKG_NAME="oscam"
-PKG_VERSION="6596"
-PKG_REV="3"
+PKG_VERSION="6626"
+PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
View
37 packages/linux-drivers/linux-tbs-drivers/init.d/63_tbs-ir
@@ -0,0 +1,37 @@
+################################################################################
+# Copyright (C) 2009-2010 OpenELEC.tv
+# http://www.openelec.tv
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC.tv; see the file COPYING. If not, write to
+# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+# http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# initialize tbs ir
+#
+# runlevels: openelec
+
+(
+ progress "initializing tbs ir"
+ while [ true ] ; do
+ if [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+ sleep 1
+ continue
+ else
+ ir-keytable -c
+ ir-keytable -s rc0 -p NEC,RC6 -w /etc/rc_keymaps/rc6_mce
+ break
+ fi
+ done
+)&
Please sign in to comment.
Something went wrong with that request. Please try again.