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

packages/3rdparty/x11/app/xdotool/build

@@ -21,3 +21,8 @@
 ################################################################################
 
 . config/options $1
+
+cd $PKG_BUILD
+
+make xdotool.static
+mv xdotool.static xdotool

packages/3rdparty/x11/app/xdotool/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xdotool"
+PKG_VERSION="2.20110530.1"
+PKG_REV="1"
+PKG_ARCH=""
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.semicomplete.com/projects/xdotool/"
+PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/app"
+PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
+PKG_LONGDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/x11/lib/libXcursor/build

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --enable-shared
+
+make
+$MAKEINSTALL

packages/3rdparty/x11/lib/libXcursor/install

@@ -21,3 +21,6 @@
 ################################################################################
 
 . config/options $1
+
+#mkdir -p $INSTALL/usr/lib
+#  cp -P $PKG_BUILD/src/.libs/libXcursor.so* $INSTALL/usr/lib

packages/3rdparty/x11/lib/libXcursor/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libXcursor"
+PKG_VERSION="1.1.13"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+# PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.x.org/pub/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libXfixes libXrender libX11"
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/lib"
+PKG_SHORTDESC="libXcursor: X Cursor Library"
+PKG_LONGDESC="X11 Cursor management library"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"

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

@@ -26,11 +26,14 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
+LOCKFILE="/var/lock/tvheadend.sleep"
+
 case "$1" in
   hibernate|suspend)
     if [ "$(pidof tvheadend)" ];then
       progress "Shutting down HTS TVHeadend for suspending..."
       tvheadend.stop
+      touch $LOCKFILE
       for module in $REMOVE_MODULES ; do
         rmmod -w $module
       done
@@ -42,7 +45,10 @@ case "$1" in
       modprobe $module
     done
     progress "Restarting HTS TVHeadend for wakeup..."
-    xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" &
+    if [ -f "$LOCKFILE" ] ; then
+      rm -rf "$LOCKFILE"
+      tvheadend.start
+    fi
     ;;
   *) exit $NA
     ;;

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

@@ -27,10 +27,14 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
 
+LOCKFILE="/var/lock/vdr.sleep"
+
 if [ ! "$REMOVE_MODULES" == "" ] ; then
   case "$1" in
     hibernate|suspend)
+      progress "Shutting down vdr for suspending..."
       vdr.stop
+      touch $LOCKFILE
       for module in $REMOVE_MODULES ; do
         rmmod -w $module
       done
@@ -39,7 +43,11 @@ if [ ! "$REMOVE_MODULES" == "" ] ; then
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
-      xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" &
+      progress "Restarting vdr for wakeup..."
+      if [ -f "$LOCKFILE" ] ; then
+        rm -rf "$LOCKFILE"
+        vdr.start
+      fi
       ;;
     *) exit $NA
       ;;

packages/x11/other/ratpoison/init.d/73_ratpoison

@@ -29,5 +29,9 @@
     wait_for_xorg
 
   # starting ratpoison
-    DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+    if [ -f /storage/.config/ratpoisonrc ]; then
+      DISPLAY=:0.0 ratpoison -f /storage/.config/ratpoisonrc > /dev/null 2>&1
+    else
+      DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+    fi
 )&

packages/x11/toolkits/pango/config/pangorc

@@ -0,0 +1,6 @@
+[Pango]
+ModuleFiles = /etc/pango/pango.modules
+ModulesPath = /usr/lib/pango/1.6.0/modules
+
+[PangoX]
+AliasFiles = /etc/pango/pangox.aliases

packages/x11/toolkits/pango/install

@@ -38,3 +38,4 @@ mkdir -p $INSTALL/usr/bin
 mkdir -p $INSTALL/etc/pango
   cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango
   cp $PKG_DIR/config/pango.modules $INSTALL/etc/pango
+  cp $PKG_DIR/config/pangorc $INSTALL/etc/pango