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

OpenELEC · Apr 23, 2012 · 94d3842 · 94d3842
2 parents 82c55cd + bd6d680
commit 94d3842
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 122 deletions.
diff --git a/packages/addons/service/multimedia/hts-tvheadend/addon b/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
diff --git a/packages/addons/service/multimedia/hts-tvheadend/build b/packages/addons/service/multimedia/hts-tvheadend/build
@@ -34,3 +34,4 @@ cd $PKG_BUILD
             --release
 
 make
+make build.linux/tvheadend.bundle
diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/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

diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/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"

diff --git a/...90-add_CH-GA-Weissenstein_muxes-0.1.patch → ...90-add_CH-GA-Weissenstein_muxes-0.1.patch b/...90-add_CH-GA-Weissenstein_muxes-0.1.patch → ...90-add_CH-GA-Weissenstein_muxes-0.1.patch
diff --git a/...-85e23bb-091-cwc-connection-attempt.patch → ...-78213a0-091-cwc-connection-attempt.patch b/...-85e23bb-091-cwc-connection-attempt.patch → ...-78213a0-091-cwc-connection-attempt.patch
diff --git a/...092-deliver_raw_teletext_to_clients.patch → ...092-deliver_raw_teletext_to_clients.patch b/...092-deliver_raw_teletext_to_clients.patch → ...092-deliver_raw_teletext_to_clients.patch
diff --git a/...23bb-093-add_support_for_IPTV_radio.patch → ...13a0-093-add_support_for_IPTV_radio.patch b/...23bb-093-add_support_for_IPTV_radio.patch → ...13a0-093-add_support_for_IPTV_radio.patch
diff --git a/...imedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-095-fix_ca_descr_parser_for_4aee.patch b/...imedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-095-fix_ca_descr_parser_for_4aee.patch
diff --git a/...ice/multimedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-096-bulcrypt_emm_support.patch b/...ice/multimedia/hts-tvheadend/patches/hts-tvheadend-85e23bb-096-bulcrypt_emm_support.patch
diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/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
 

diff --git a/packages/addons/service/softcam/oscam/meta b/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"

diff --git a/packages/linux-drivers/linux-tbs-drivers/init.d/63_tbs-ir b/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
+)&