Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,3 +1,6 @@
+0.99.3
+- update to makemkv-1.6.15
+
 0.99.2
 - change icon
 

packages/addons/multimedia/makemkv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.6.10"
+PKG_VERSION="1.6.15"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

packages/addons/service/multimedia/hts-tvheadend/changelog.txt

@@ -1,3 +1,9 @@
+0.99.8
+- add suspend/wakeup script
+
+0.99.7
+- update to hts-tvheadend-c88a646
+
 0.99.6
 - update to hts-tvheadend-9d775da
 

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="9d775da"
+PKG_VERSION="c88a646"
-PKG_REV="6"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+LOCKDIR="/var/lock/"
+LOCKFILE="tvheadend"
+
+case "$1" in
+  hibernate|suspend)
+    if [ $(pidof tvheadend) ];then
+      progress "Shutting down HTS TVHeadend for suspending..."
+      mkdir -p "$LOCKDIR"
+      touch "$LOCKDIR/$LOCKFILE"
+      killall tvheadend
+    fi
+    ;;
+
+  thaw|resume)
+    if [ -f "$LOCKDIR/$LOCKFILE" ];then
+      progress "Restarting HTS TVHeadend for wakeup..."
+      tvheadend.service
+      rm -rf "$LOCKDIR/$LOCKFILE"
+    fi
+    ;;
+
+  *) exit $NA
+    ;;
+esac
+

packages/mediacenter/xbmc/sleep.d/00_addon-sleep

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+for script in $HOME/.xbmc/addons/*/sleep.d/*.power; do
+  progress "running addon sleep script $script ($1)..."
+  sh $script $1
+done

packages/sysutils/pm-utils/config.d/module

@@ -1 +1 @@
-SUSPEND_MODULES="jme anysee"
+SUSPEND_MODULES="xhci-hcd jme anysee"

projects/Fusion/linux/linux.i386.conf

@@ -2293,7 +2293,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Fusion/linux/linux.x86_64.conf

@@ -2244,7 +2244,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Generic/linux/linux.i386.conf

@@ -2473,7 +2473,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Generic_OSS/linux/linux.i386.conf

@@ -2471,7 +2471,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/ION/linux/linux.i386.conf

@@ -2326,7 +2326,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/ION/linux/linux.x86_64.conf

@@ -2268,7 +2268,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Intel/linux/linux.i386.conf

@@ -2385,7 +2385,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Intel/linux/linux.x86_64.conf

@@ -2332,7 +2332,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

projects/Ultra/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc6 Kernel Configuration
+# Linux/x86_64 3.1.0-rc7 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -184,7 +184,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
@@ -2116,7 +2115,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y