From 44799c2ae26e10760430102efe7ce668055c9300 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 13 Apr 2012 09:50:29 +0200 Subject: [PATCH 1/2] web browser: packages moved to 3rdparty ratpoison: add support for alternative configuration file pango: add configuration file --- .../{ => 3rdparty}/graphics/libpng12/build | 0 .../{ => 3rdparty}/graphics/libpng12/meta | 0 .../{ => 3rdparty}/graphics/libpng12/unpack | 0 packages/{ => 3rdparty}/security/nss/build | 0 packages/{ => 3rdparty}/security/nss/meta | 0 packages/{ => 3rdparty}/textproc/bbe/build | 0 packages/{ => 3rdparty}/textproc/bbe/meta | 0 .../x11/app/xdotool/build} | 5 +++ packages/3rdparty/x11/app/xdotool/meta | 35 ++++++++++++++++++ packages/3rdparty/x11/lib/libXcursor/build | 35 ++++++++++++++++++ .../x11/lib/libXcursor}/install | 3 ++ packages/3rdparty/x11/lib/libXcursor/meta | 36 +++++++++++++++++++ .../x11/other/ratpoison/init.d/73_ratpoison | 6 +++- packages/x11/toolkits/pango/config/pangorc | 6 ++++ packages/x11/toolkits/pango/install | 1 + 15 files changed, 126 insertions(+), 1 deletion(-) rename packages/{ => 3rdparty}/graphics/libpng12/build (100%) rename packages/{ => 3rdparty}/graphics/libpng12/meta (100%) rename packages/{ => 3rdparty}/graphics/libpng12/unpack (100%) rename packages/{ => 3rdparty}/security/nss/build (100%) rename packages/{ => 3rdparty}/security/nss/meta (100%) rename packages/{ => 3rdparty}/textproc/bbe/build (100%) rename packages/{ => 3rdparty}/textproc/bbe/meta (100%) rename packages/{graphics/libpng12/install => 3rdparty/x11/app/xdotool/build} (94%) create mode 100644 packages/3rdparty/x11/app/xdotool/meta create mode 100755 packages/3rdparty/x11/lib/libXcursor/build rename packages/{security/nss => 3rdparty/x11/lib/libXcursor}/install (92%) create mode 100644 packages/3rdparty/x11/lib/libXcursor/meta create mode 100644 packages/x11/toolkits/pango/config/pangorc diff --git a/packages/graphics/libpng12/build b/packages/3rdparty/graphics/libpng12/build similarity index 100% rename from packages/graphics/libpng12/build rename to packages/3rdparty/graphics/libpng12/build diff --git a/packages/graphics/libpng12/meta b/packages/3rdparty/graphics/libpng12/meta similarity index 100% rename from packages/graphics/libpng12/meta rename to packages/3rdparty/graphics/libpng12/meta diff --git a/packages/graphics/libpng12/unpack b/packages/3rdparty/graphics/libpng12/unpack similarity index 100% rename from packages/graphics/libpng12/unpack rename to packages/3rdparty/graphics/libpng12/unpack diff --git a/packages/security/nss/build b/packages/3rdparty/security/nss/build similarity index 100% rename from packages/security/nss/build rename to packages/3rdparty/security/nss/build diff --git a/packages/security/nss/meta b/packages/3rdparty/security/nss/meta similarity index 100% rename from packages/security/nss/meta rename to packages/3rdparty/security/nss/meta diff --git a/packages/textproc/bbe/build b/packages/3rdparty/textproc/bbe/build similarity index 100% rename from packages/textproc/bbe/build rename to packages/3rdparty/textproc/bbe/build diff --git a/packages/textproc/bbe/meta b/packages/3rdparty/textproc/bbe/meta similarity index 100% rename from packages/textproc/bbe/meta rename to packages/3rdparty/textproc/bbe/meta diff --git a/packages/graphics/libpng12/install b/packages/3rdparty/x11/app/xdotool/build similarity index 94% rename from packages/graphics/libpng12/install rename to packages/3rdparty/x11/app/xdotool/build index 0ca72c8177..1f5e21e076 100755 --- a/packages/graphics/libpng12/install +++ b/packages/3rdparty/x11/app/xdotool/build @@ -21,3 +21,8 @@ ################################################################################ . config/options $1 + +cd $PKG_BUILD + +make xdotool.static +mv xdotool.static xdotool diff --git a/packages/3rdparty/x11/app/xdotool/meta b/packages/3rdparty/x11/app/xdotool/meta new file mode 100644 index 0000000000..b4bfc9d227 --- /dev/null +++ b/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" diff --git a/packages/3rdparty/x11/lib/libXcursor/build b/packages/3rdparty/x11/lib/libXcursor/build new file mode 100755 index 0000000000..a47c4d38fa --- /dev/null +++ b/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 diff --git a/packages/security/nss/install b/packages/3rdparty/x11/lib/libXcursor/install similarity index 92% rename from packages/security/nss/install rename to packages/3rdparty/x11/lib/libXcursor/install index 0ca72c8177..b37dd417f9 100755 --- a/packages/security/nss/install +++ b/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 diff --git a/packages/3rdparty/x11/lib/libXcursor/meta b/packages/3rdparty/x11/lib/libXcursor/meta new file mode 100644 index 0000000000..6812cb87af --- /dev/null +++ b/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" diff --git a/packages/x11/other/ratpoison/init.d/73_ratpoison b/packages/x11/other/ratpoison/init.d/73_ratpoison index 49f9e20e6f..c4846ace6e 100644 --- a/packages/x11/other/ratpoison/init.d/73_ratpoison +++ b/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 )& diff --git a/packages/x11/toolkits/pango/config/pangorc b/packages/x11/toolkits/pango/config/pangorc new file mode 100644 index 0000000000..da60cdad42 --- /dev/null +++ b/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 diff --git a/packages/x11/toolkits/pango/install b/packages/x11/toolkits/pango/install index 7e65c9e7a8..95cf37ffa2 100755 --- a/packages/x11/toolkits/pango/install +++ b/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 From 8e3ad74fd55cc0887ea2fda977b9a9d7909a7920 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Apr 2012 11:17:57 +0300 Subject: [PATCH 2/2] vdr & tvheadend: suspend/resume fixes --- .../hts-tvheadend/source/sleep.d/tvheadend.power | 8 +++++++- .../multimedia/vdr-addon/source/sleep.d/modules.power | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power index b076ca9e9c..1c0bfeb40b 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power +++ b/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 ;; diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power index 2d44b7a858..68e5c5e438 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power +++ b/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 ;;