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

packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="329cbe8"
+PKG_VERSION="e3200c8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/service/downloadmanager/transmission/source/bin/transmission.start

@@ -83,7 +83,7 @@ if [ ! "$(pidof transmission-daemon)" ];then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
-    LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
+    EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
     sleep 1
   done &
 fi

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,4 +1,5 @@
 2.1.6
+- update to vdr-plugin-dvbapi-e3200c8
 - added vdr-xmltv2vdr plugin
 - added xineliboutput plugin
 - added text2skin plugin

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -29,6 +29,6 @@
 		<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
-                <setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc" enable="!eq(-1,false)" default="sc" />
+                <setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc|dvbapi" enable="!eq(-1,false)" default="sc" />
     </category>
 </settings>

packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power

@@ -29,27 +29,26 @@ REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e
 
 LOCKFILE="/var/lock/vdr.sleep"
 
-if [ ! "$REMOVE_MODULES" == "" ] ; then
+case "$1" in
-  case "$1" in
+  hibernate|suspend)
-    hibernate|suspend)
+    progress "Shutting down vdr for suspending..."
-      progress "Shutting down vdr for suspending..."
+    vdr.stop
-      vdr.stop
+    touch $LOCKFILE
-      touch $LOCKFILE
+    for module in $REMOVE_MODULES ; do
-      for module in $REMOVE_MODULES ; do
+      rmmod -w $module
-        rmmod -w $module
+    done
-      done
+    ;;
-      ;;
+  thaw|resume)
-    thaw|resume)
+    for module in $REMOVE_MODULES ; do
-      for module in $REMOVE_MODULES ; do
+      modprobe $module
-        modprobe $module
+    done
-      done
+    progress "Restarting vdr for wakeup..."
-      progress "Restarting vdr for wakeup..."
+    if [ -f "$LOCKFILE" ] ; then
-      if [ -f "$LOCKFILE" ] ; then
+      rm -rf "$LOCKFILE"
-        rm -rf "$LOCKFILE"
+      vdr.start
-        vdr.start
+    fi
-      fi
+    ;;
-      ;;
+  *) exit $NA
-    *) exit $NA
+    ;;
-      ;;
+esac
-  esac
+
-fi

packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf

@@ -114,7 +114,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
 # CONFIG_FEATURE_SKIP_ROOTFS is not set
-CONFIG_MONOTONIC_SYSCALL=y
+# CONFIG_MONOTONIC_SYSCALL is not set
 # CONFIG_IOCTL_HEX2STR_ERROR is not set
 # CONFIG_FEATURE_HWIB is not set